diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-15 19:57:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-15 19:57:57 -0700 |
| commit | ebb1951d3624c2f961abe676645c13e5a1145569 (patch) | |
| tree | 5c63654338f2caf0b9dc41281b7b6a7b39ea5577 /lib | |
| parent | f2b6079464fc73cf12f08248180a618f05033a70 (diff) | |
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 <davem@davemloft.net>
Acked-by: Michael Ellerman <michael@ellerman.id.au>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lmb.c | 2 |
1 files changed, 2 insertions, 0 deletions
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]; |