summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2008-05-16 06:09:59 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-23 16:15:29 +1000
commitecc240f90bce23651f9866a1523ba55faa89f009 (patch)
tree670e8da2717cbaab86911715c8430f91f16b5211 /arch
parent75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 (diff)
downloadop-kernel-dev-ecc240f90bce23651f9866a1523ba55faa89f009.zip
op-kernel-dev-ecc240f90bce23651f9866a1523ba55faa89f009.tar.gz
[POWERPC] PS3: Fix memory hotplug
A change was made to walk_memory_resource() in commit 4b119e21d0c66c22e8ca03df05d9de623d0eb50f that added a check of find_lmb(). Add the coresponding lmb_add() call to ps3_mm_add_memory() so that that check will succeed. This fixes the condition where the PS3 boots up with only the 128 MiB of boot memory, and doesn't see the other 128MiB that is available. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/ps3/mm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 5b3fb2b..3a58ffa 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void)
return result;
}
+ lmb_add(start_addr, map.r1.size);
+ lmb_analyze();
+
result = online_pages(start_pfn, nr_pages);
if (result)
OpenPOWER on IntegriCloud