diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/smp.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/smp.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 6f32c4eca6e5..330354113186 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c | |||
@@ -900,7 +900,7 @@ void smp_core99_cpu_die(unsigned int cpu) | |||
900 | cpu_dead[cpu] = 0; | 900 | cpu_dead[cpu] = 0; |
901 | } | 901 | } |
902 | 902 | ||
903 | #endif | 903 | #endif /* CONFIG_HOTPLUG_CPU && CONFIG_PP32 */ |
904 | 904 | ||
905 | /* Core99 Macs (dual G4s and G5s) */ | 905 | /* Core99 Macs (dual G4s and G5s) */ |
906 | struct smp_ops_t core99_smp_ops = { | 906 | struct smp_ops_t core99_smp_ops = { |
@@ -910,8 +910,16 @@ struct smp_ops_t core99_smp_ops = { | |||
910 | .setup_cpu = smp_core99_setup_cpu, | 910 | .setup_cpu = smp_core99_setup_cpu, |
911 | .give_timebase = smp_core99_give_timebase, | 911 | .give_timebase = smp_core99_give_timebase, |
912 | .take_timebase = smp_core99_take_timebase, | 912 | .take_timebase = smp_core99_take_timebase, |
913 | #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32) | 913 | #if defined(CONFIG_HOTPLUG_CPU) |
914 | # if defined(CONFIG_PPC32) | ||
914 | .cpu_disable = smp_core99_cpu_disable, | 915 | .cpu_disable = smp_core99_cpu_disable, |
915 | .cpu_die = smp_core99_cpu_die, | 916 | .cpu_die = smp_core99_cpu_die, |
917 | # endif | ||
918 | # if defined(CONFIG_PPC64) | ||
919 | .cpu_disable = generic_cpu_disable, | ||
920 | .cpu_die = generic_cpu_die, | ||
921 | /* intentionally do *NOT* assign cpu_enable, | ||
922 | * the generic code will use kick_cpu then! */ | ||
923 | # endif | ||
916 | #endif | 924 | #endif |
917 | }; | 925 | }; |