diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2009-02-12 12:36:16 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-13 16:37:45 +1100 |
| commit | 0047656e2a97d4452dd7df9e52591a7afe21a263 (patch) | |
| tree | c6f5da47885c4da942a68803fc99c4d326e13e73 | |
| parent | 06eccea6c34e00c8fedce49229ed35fa84619fb7 (diff) | |
| download | op-kernel-dev-0047656e2a97d4452dd7df9e52591a7afe21a263.zip op-kernel-dev-0047656e2a97d4452dd7df9e52591a7afe21a263.tar.gz | |
powerpc/ps3: Move ps3_mm_add_memory to device_initcall
Change the PS3 hotplug memory routine ps3_mm_add_memory() from
a core_initcall to a device_initcall.
core_initcall routines run before the powerpc topology_init()
startup routine, which is a subsys_initcall, resulting in
failure of ps3_mm_add_memory() when CONFIG_NUMA=y. When
ps3_mm_add_memory() fails the system will boot with just the
128 MiB of boot memory
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/platforms/ps3/mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index 67de6bf3..d281cc0 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c @@ -328,7 +328,7 @@ static int __init ps3_mm_add_memory(void) return result; } -core_initcall(ps3_mm_add_memory); +device_initcall(ps3_mm_add_memory); /*============================================================================*/ /* dma routines */ |
