diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-07-04 17:13:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-26 01:28:24 +1000 |
| commit | 30f30e13055d1e018c70d2b1b3ff86f8c25c511b (patch) | |
| tree | cf452ba456760b40b0e3418a363b6e5b40eba6a6 /arch | |
| parent | 98c82472e98469ef23d7c680a0d6be1429540166 (diff) | |
| download | op-kernel-dev-30f30e13055d1e018c70d2b1b3ff86f8c25c511b.zip op-kernel-dev-30f30e13055d1e018c70d2b1b3ff86f8c25c511b.tar.gz | |
[POWERPC] Fix mem= handling when the memory limit is > RMO size
There's a bug in my cleaned up mem= handling, if the memory limit is
larger than the RMO size we'll erroneously enlarge the RMO size.
Fix is to only change the RMO size if the memory limit is less than
the current RMO value.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/lmb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/lmb.c b/arch/powerpc/mm/lmb.c index 4b17a73..716a290 100644 --- a/arch/powerpc/mm/lmb.c +++ b/arch/powerpc/mm/lmb.c @@ -320,7 +320,8 @@ void __init lmb_enforce_memory_limit(unsigned long memory_limit) break; } - lmb.rmo_size = lmb.memory.region[0].size; + if (lmb.memory.region[0].size < lmb.rmo_size) + lmb.rmo_size = lmb.memory.region[0].size; /* And truncate any reserves above the limit also. */ for (i = 0; i < lmb.reserved.cnt; i++) { |
