projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6-watchdog-mm
[powerpc.git]
/
arch
/
powerpc
/
mm
/
lmb.c
diff --git
a/arch/powerpc/mm/lmb.c
b/arch/powerpc/mm/lmb.c
index
4b17a73
..
716a290
100644
(file)
--- 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++) {