Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0047656e authored by Geoff Levand's avatar Geoff Levand Committed by Benjamin Herrenschmidt
Browse files

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: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 06eccea6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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                                                               */