summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-18 12:03:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-18 12:03:23 -0700
commit1de481ded98d1d48e2a4102a5aa549e3c4d18ee3 (patch)
treedefeccfeac5a86c349f4cac61a8689f3597d3201 /lib
parentabcf42419d24416175ea8bc9a502d833f64955d1 (diff)
parentebb1951d3624c2f961abe676645c13e5a1145569 (diff)
downloadop-kernel-dev-1de481ded98d1d48e2a4102a5aa549e3c4d18ee3.zip
op-kernel-dev-1de481ded98d1d48e2a4102a5aa549e3c4d18ee3.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: lmb: Fix reserved region handling in lmb_enforce_memory_limit(). sparc64: Fix cmdline_memory_size handling bugs. sparc64: Fix overshoot in nid_range().
Diffstat (limited to 'lib')
-rw-r--r--lib/lmb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/lmb.c b/lib/lmb.c
index 5d7b928..97e54703 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -462,6 +462,8 @@ void __init lmb_enforce_memory_limit(u64 memory_limit)
if (lmb.memory.region[0].size < lmb.rmo_size)
lmb.rmo_size = lmb.memory.region[0].size;
+ memory_limit = lmb_end_of_DRAM();
+
/* And truncate any reserves above the limit also. */
for (i = 0; i < lmb.reserved.cnt; i++) {
p = &lmb.reserved.region[i];
OpenPOWER on IntegriCloud