Patchwork powerpc/ps3: Move ps3_mm_add_memory to device_initcall

login
register
mail settings
Submitter Geoff Levand
Date Feb. 12, 2009, 10:36 p.m.
Message ID <4994A460.8000807@am.sony.com>
Download mbox | patch
Permalink /patch/23081/
State Accepted, archived
Commit 0047656e2a97d4452dd7df9e52591a7afe21a263
Headers show

Comments

Geoff Levand - Feb. 12, 2009, 10:36 p.m.
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>
---
Ben,

Please send upstream for 2.6.29, as this effects the current
Fedora 11 development kernel, and maybe other distros which
are based on 2.6.29.

 arch/powerpc/platforms/ps3/mm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

--- 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                                                               */