Patchwork powerpc: Fix crash on CPU hotplug

login
register
mail settings
Submitter Michael Ellerman
Date April 16, 2009, 2:47 p.m.
Message ID <c4a572b413fe5f999d01137da262118170a3683e.1239893244.git.michael@ellerman.id.au>
Download mbox | patch
Permalink /patch/26071/
State Accepted
Commit 24f1ce803c55f645429e6a7dd94763fbace84b0a
Delegated to: Paul Mackerras
Headers show

Comments

Michael Ellerman - April 16, 2009, 2:47 p.m.
early_init_mmu_secondary() is called at CPU hotplug time, so it
must be marked as __cpuinit, not __init.

Caused by 757c74d2 (Introduce early_init_mmu() on 64-bit).

Tested-by: Sachin Sant <sachinp@in.ibm.com>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 arch/powerpc/mm/hash_utils_64.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index db556d2..1ade7eb 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)
 }
 
 #ifdef CONFIG_SMP
-void __init early_init_mmu_secondary(void)
+void __cpuinit early_init_mmu_secondary(void)
 {
 	/* Initialize hash table for that CPU */
 	if (!firmware_has_feature(FW_FEATURE_LPAR))