target/linux/ps3/patches-2.6.28/0014-powerpc-ps3-Move-ps3_mm_add_memory-to-device_initca.patch

   1 From 0047656e2a97d4452dd7df9e52591a7afe21a263 Mon Sep 17 00:00:00 2001
   2 From: Geoff Levand <geoffrey.levand@am.sony.com>
   3 Date: Thu, 12 Feb 2009 12:36:16 +0000
   4 Subject: [PATCH] powerpc/ps3: Move ps3_mm_add_memory to device_initcall
   5
   6 Change the PS3 hotplug memory routine ps3_mm_add_memory() from
   7 a core_initcall to a device_initcall.
   8
   9 core_initcall routines run before the powerpc topology_init()
  10 startup routine, which is a subsys_initcall, resulting in
  11 failure of ps3_mm_add_memory() when CONFIG_NUMA=y.  When
  12 ps3_mm_add_memory() fails the system will boot with just the
  13 128 MiB of boot memory
  14
  15 Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
  16 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  17 ---
  18  arch/powerpc/platforms/ps3/mm.c |    2 +-
  19  1 files changed, 1 insertions(+), 1 deletions(-)
  20
  21 diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
  22 index 67de6bf..d281cc0 100644
  23 --- a/arch/powerpc/platforms/ps3/mm.c
  24 +++ b/arch/powerpc/platforms/ps3/mm.c
  25 @@ -328,7 +328,7 @@ static int __init ps3_mm_add_memory(void)
  26         return result;
  27  }
  28
  29 -core_initcall(ps3_mm_add_memory);
  30 +device_initcall(ps3_mm_add_memory);
  31
  32  /*============================================================================*/
  33  /* dma routines                                                               */
  34 --
  35 1.6.0.4
  36