From: Paul Mackerras <paulus@samba.org>
Date: Wed, 26 Oct 2005 11:54:21 +0000 (+1000)
Subject: powerpc32: Limit memory to lowmem if !CONFIG_HIGHMEM.
X-Git-Tag: v2.6.15-rc1~59^2~86
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa39dc437a41733adaba241fd9036760283a516a;p=linux-2.6

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>
---

diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index aa6a5440ce..8dd1f7d0e2 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 */
 	}