aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch
diff options
context:
space:
mode:
authorHamish Guthrie <hcg@openwrt.org>2009-03-24 08:54:41 +0000
committerHamish Guthrie <hcg@openwrt.org>2009-03-24 08:54:41 +0000
commit80ab269aa9d9ca6d0f076f01bcd808afb982ea48 (patch)
tree2d93aed964211e06410ea5c2206ee31654facb63 /target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch
parent84311deed17c7e579be5b16d12b6d6de2f131a2c (diff)
downloadmaster-187ad058-80ab269aa9d9ca6d0f076f01bcd808afb982ea48.tar.gz
master-187ad058-80ab269aa9d9ca6d0f076f01bcd808afb982ea48.tar.bz2
master-187ad058-80ab269aa9d9ca6d0f076f01bcd808afb982ea48.zip
ps3: update ps3vram patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15011 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch36
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
+