summaryrefslogtreecommitdiff
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-26 21:54:21 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-26 21:54:21 +1000
commitfa39dc437a41733adaba241fd9036760283a516a (patch)
tree4570515bf765a23bbfd1b4d47f1384afa6e73e79 /arch/powerpc/mm
parentb41fc4f82f6a73b8b2e8f44bd7ef075797d2dacb (diff)
powerpc32: Limit memory to lowmem if !CONFIG_HIGHMEM.
This trims off the extra unusable memory from the lmb structure, so we don't try to use it. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/init_32.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index aa6a5440cec1..8dd1f7d0e23c 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -154,10 +154,13 @@ void __init MMU_init(void)
* in the fixed entries */
adjust_total_lowmem();
#endif /* CONFIG_FSL_BOOKE */
+
if (total_lowmem > __max_low_memory) {
total_lowmem = __max_low_memory;
#ifndef CONFIG_HIGHMEM
total_memory = total_lowmem;
+ lmb_enforce_memory_limit(total_lowmem);
+ lmb_analyze();
#endif /* CONFIG_HIGHMEM */
}