diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/smp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 15c2241f9c72..47a2b4488557 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -480,7 +480,7 @@ static void __init pmac_init_early(void) | |||
480 | #endif | 480 | #endif |
481 | 481 | ||
482 | /* SMP Init has to be done early as we need to patch up | 482 | /* SMP Init has to be done early as we need to patch up |
483 | * cpu_possible_map before interrupt stacks are allocated | 483 | * cpu_possible_mask before interrupt stacks are allocated |
484 | * or kaboom... | 484 | * or kaboom... |
485 | */ | 485 | */ |
486 | #ifdef CONFIG_SMP | 486 | #ifdef CONFIG_SMP |
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 6898e8241cd0..02d0b8e5b13c 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c | |||
@@ -315,7 +315,7 @@ static int __init smp_psurge_probe(void) | |||
315 | /* This is necessary because OF doesn't know about the | 315 | /* This is necessary because OF doesn't know about the |
316 | * secondary cpu(s), and thus there aren't nodes in the | 316 | * secondary cpu(s), and thus there aren't nodes in the |
317 | * device tree for them, and smp_setup_cpu_maps hasn't | 317 | * device tree for them, and smp_setup_cpu_maps hasn't |
318 | * set their bits in cpu_present_map. | 318 | * set their bits in cpu_present_mask. |
319 | */ | 319 | */ |
320 | if (ncpus > NR_CPUS) | 320 | if (ncpus > NR_CPUS) |
321 | ncpus = NR_CPUS; | 321 | ncpus = NR_CPUS; |
@@ -944,7 +944,7 @@ void __init pmac_setup_smp(void) | |||
944 | } | 944 | } |
945 | #ifdef CONFIG_PPC32 | 945 | #ifdef CONFIG_PPC32 |
946 | else { | 946 | else { |
947 | /* We have to set bits in cpu_possible_map here since the | 947 | /* We have to set bits in cpu_possible_mask here since the |
948 | * secondary CPU(s) aren't in the device tree. Various | 948 | * secondary CPU(s) aren't in the device tree. Various |
949 | * things won't be initialized for CPUs not in the possible | 949 | * things won't be initialized for CPUs not in the possible |
950 | * map, so we really need to fix it up here. | 950 | * map, so we really need to fix it up here. |