aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2009-04-16 00:47:32 -0400
committerPaul Mackerras <paulus@samba.org>2009-04-22 00:56:34 -0400
commit24f1ce803c55f645429e6a7dd94763fbace84b0a (patch)
tree0f80fc2e3699845379437780c793850bc59e37aa
parent5bd3ef84d73c2ea7b4babbad060909753c4828d4 (diff)
powerpc: Fix crash on CPU hotplug
early_init_mmu_secondary() is called at CPU hotplug time, so it must be marked as __cpuinit, not __init. Caused by 757c74d2 ("powerpc/mm: Introduce early_init_mmu() on 64-bit"). Tested-by: Sachin Sant <sachinp@in.ibm.com> Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/mm/hash_utils_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index db556d25c3a7..1ade7eb6ae00 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -753,7 +753,7 @@ void __init early_init_mmu(void)
753} 753}
754 754
755#ifdef CONFIG_SMP 755#ifdef CONFIG_SMP
756void __init early_init_mmu_secondary(void) 756void __cpuinit early_init_mmu_secondary(void)
757{ 757{
758 /* Initialize hash table for that CPU */ 758 /* Initialize hash table for that CPU */
759 if (!firmware_has_feature(FW_FEATURE_LPAR)) 759 if (!firmware_has_feature(FW_FEATURE_LPAR))