diff options
Diffstat (limited to 'target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch')
-rw-r--r-- | target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch b/target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch new file mode 100644 index 0000000000..ad2a6caad9 --- /dev/null +++ b/target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch @@ -0,0 +1,36 @@ +From 0047656e2a97d4452dd7df9e52591a7afe21a263 Mon Sep 17 00:00:00 2001 +From: Geoff Levand <geoffrey.levand@am.sony.com> +Date: Thu, 12 Feb 2009 12:36:16 +0000 +Subject: [PATCH] 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> +--- + 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 67de6bf..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 */ +-- +1.6.0.4 + |