Skip to content

Commit

Permalink
powerpc/ps3: Move ps3_mm_add_memory to device_initcall
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geoff Levand authored and Benjamin Herrenschmidt committed Feb 13, 2009
1 parent 06eccea commit 0047656
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/ps3/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 0047656

Please sign in to comment.