diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 12:42:33 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 12:42:33 -0500 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /arch/powerpc/mm/lmb.c | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/powerpc/mm/lmb.c')
| -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 4b17a735992..716a2906a24 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++) { |