diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/smp.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/smp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 6898e8241cd0..c95215f4f8b6 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c | |||
@@ -53,6 +53,8 @@ | |||
53 | #include <asm/pmac_low_i2c.h> | 53 | #include <asm/pmac_low_i2c.h> |
54 | #include <asm/pmac_pfunc.h> | 54 | #include <asm/pmac_pfunc.h> |
55 | 55 | ||
56 | #include "pmac.h" | ||
57 | |||
56 | #undef DEBUG | 58 | #undef DEBUG |
57 | 59 | ||
58 | #ifdef DEBUG | 60 | #ifdef DEBUG |
@@ -315,7 +317,7 @@ static int __init smp_psurge_probe(void) | |||
315 | /* This is necessary because OF doesn't know about the | 317 | /* This is necessary because OF doesn't know about the |
316 | * secondary cpu(s), and thus there aren't nodes in the | 318 | * secondary cpu(s), and thus there aren't nodes in the |
317 | * device tree for them, and smp_setup_cpu_maps hasn't | 319 | * device tree for them, and smp_setup_cpu_maps hasn't |
318 | * set their bits in cpu_present_map. | 320 | * set their bits in cpu_present_mask. |
319 | */ | 321 | */ |
320 | if (ncpus > NR_CPUS) | 322 | if (ncpus > NR_CPUS) |
321 | ncpus = NR_CPUS; | 323 | ncpus = NR_CPUS; |
@@ -878,10 +880,9 @@ int smp_core99_cpu_disable(void) | |||
878 | return 0; | 880 | return 0; |
879 | } | 881 | } |
880 | 882 | ||
881 | extern void low_cpu_die(void) __attribute__((noreturn)); /* in sleep.S */ | ||
882 | static int cpu_dead[NR_CPUS]; | 883 | static int cpu_dead[NR_CPUS]; |
883 | 884 | ||
884 | void cpu_die(void) | 885 | void pmac32_cpu_die(void) |
885 | { | 886 | { |
886 | local_irq_disable(); | 887 | local_irq_disable(); |
887 | cpu_dead[smp_processor_id()] = 1; | 888 | cpu_dead[smp_processor_id()] = 1; |
@@ -944,7 +945,7 @@ void __init pmac_setup_smp(void) | |||
944 | } | 945 | } |
945 | #ifdef CONFIG_PPC32 | 946 | #ifdef CONFIG_PPC32 |
946 | else { | 947 | else { |
947 | /* We have to set bits in cpu_possible_map here since the | 948 | /* We have to set bits in cpu_possible_mask here since the |
948 | * secondary CPU(s) aren't in the device tree. Various | 949 | * secondary CPU(s) aren't in the device tree. Various |
949 | * things won't be initialized for CPUs not in the possible | 950 | * things won't be initialized for CPUs not in the possible |
950 | * map, so we really need to fix it up here. | 951 | * map, so we really need to fix it up here. |