]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc/ps3: Move ps3_mm_add_memory to device_initcall
authorGeoff Levand <geoffrey.levand@am.sony.com>
Thu, 12 Feb 2009 12:36:16 +0000 (12:36 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 13 Feb 2009 05:37:45 +0000 (16:37 +1100)
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>
arch/powerpc/platforms/ps3/mm.c

index 67de6bf3db3d243a6d542dec9b9028d7f9fcf111..d281cc0bca712fd24553ca34b9477d5c8e47b68e 100644 (file)
@@ -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                                                               */