diff options
| author |   Michael Ellerman <michael@ellerman.id.au> | 2009-04-16 04:47:32 +0000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2009-04-22 14:56:34 +1000 |
| commit | 24f1ce803c55f645429e6a7dd94763fbace84b0a (patch) | |
| tree | 0f80fc2e3699845379437780c793850bc59e37aa /arch/powerpc/mm/hash_utils_64.c | |
| parent | Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge (diff) | |
| download | linux-dev-24f1ce803c55f645429e6a7dd94763fbace84b0a.tar.xz linux-dev-24f1ce803c55f645429e6a7dd94763fbace84b0a.zip | |
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>
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
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) } #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)) |