From: David S. Miller Date: Sat, 16 Aug 2008 02:57:57 +0000 (-0700) Subject: lmb: Fix reserved region handling in lmb_enforce_memory_limit(). X-Git-Tag: v2.6.27-rc4~45^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ebb1951d3624c2f961abe676645c13e5a1145569;p=linux-2.6-omap-h63xx.git lmb: Fix reserved region handling in lmb_enforce_memory_limit(). The idea of the implementation of this fix is from Michael Ellerman. This function has two loops, but they each interpret the memory_limit value differently. The first loop interprets it as a "size limit" whereas the second loop interprets it as an "address limit". Before the second loop runs, reset memory_limit to lmb_end_of_DRAM() so that it all works out. Signed-off-by: David S. Miller Acked-by: Michael Ellerman --- diff --git a/lib/lmb.c b/lib/lmb.c index 5d7b9286503..97e54703708 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];