diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 21:03:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 21:03:23 +0200 |
| commit | 1de481ded98d1d48e2a4102a5aa549e3c4d18ee3 (patch) | |
| tree | defeccfeac5a86c349f4cac61a8689f3597d3201 /lib | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drz... (diff) | |
| parent | lmb: Fix reserved region handling in lmb_enforce_memory_limit(). (diff) | |
| download | linux-1de481ded98d1d48e2a4102a5aa549e3c4d18ee3.tar.xz linux-1de481ded98d1d48e2a4102a5aa549e3c4d18ee3.zip | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/lmb.c b/lib/lmb.c index 5d7b9286503e..97e547037084 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]; |