diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 07:54:21 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 07:54:21 -0400 |
commit | fa39dc437a41733adaba241fd9036760283a516a (patch) | |
tree | 4570515bf765a23bbfd1b4d47f1384afa6e73e79 /arch/powerpc | |
parent | b41fc4f82f6a73b8b2e8f44bd7ef075797d2dacb (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')
-rw-r--r-- | arch/powerpc/mm/init_32.c | 3 |
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) | |||
154 | * in the fixed entries */ | 154 | * in the fixed entries */ |
155 | adjust_total_lowmem(); | 155 | adjust_total_lowmem(); |
156 | #endif /* CONFIG_FSL_BOOKE */ | 156 | #endif /* CONFIG_FSL_BOOKE */ |
157 | |||
157 | if (total_lowmem > __max_low_memory) { | 158 | if (total_lowmem > __max_low_memory) { |
158 | total_lowmem = __max_low_memory; | 159 | total_lowmem = __max_low_memory; |
159 | #ifndef CONFIG_HIGHMEM | 160 | #ifndef CONFIG_HIGHMEM |
160 | total_memory = total_lowmem; | 161 | total_memory = total_lowmem; |
162 | lmb_enforce_memory_limit(total_lowmem); | ||
163 | lmb_analyze(); | ||
161 | #endif /* CONFIG_HIGHMEM */ | 164 | #endif /* CONFIG_HIGHMEM */ |
162 | } | 165 | } |
163 | 166 | ||