diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 6 | ||||
-rw-r--r-- | arch/powerpc/kernel/smp.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 8dcec47a7b39..5e4d852f640c 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
@@ -394,14 +394,14 @@ static void __init cpu_init_thread_core_maps(int tpc) | |||
394 | 394 | ||
395 | /** | 395 | /** |
396 | * setup_cpu_maps - initialize the following cpu maps: | 396 | * setup_cpu_maps - initialize the following cpu maps: |
397 | * cpu_possible_map | 397 | * cpu_possible_mask |
398 | * cpu_present_map | 398 | * cpu_present_mask |
399 | * | 399 | * |
400 | * Having the possible map set up early allows us to restrict allocations | 400 | * Having the possible map set up early allows us to restrict allocations |
401 | * of things like irqstacks to num_possible_cpus() rather than NR_CPUS. | 401 | * of things like irqstacks to num_possible_cpus() rather than NR_CPUS. |
402 | * | 402 | * |
403 | * We do not initialize the online map here; cpus set their own bits in | 403 | * We do not initialize the online map here; cpus set their own bits in |
404 | * cpu_online_map as they come up. | 404 | * cpu_online_mask as they come up. |
405 | * | 405 | * |
406 | * This function is valid only for Open Firmware systems. finish_device_tree | 406 | * This function is valid only for Open Firmware systems. finish_device_tree |
407 | * must be called before using this. | 407 | * must be called before using this. |
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 39babb1e2ce1..bf366167d369 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -468,7 +468,7 @@ out: | |||
468 | return id; | 468 | return id; |
469 | } | 469 | } |
470 | 470 | ||
471 | /* Must be called when no change can occur to cpu_present_map, | 471 | /* Must be called when no change can occur to cpu_present_mask, |
472 | * i.e. during cpu online or offline. | 472 | * i.e. during cpu online or offline. |
473 | */ | 473 | */ |
474 | static struct device_node *cpu_to_l2cache(int cpu) | 474 | static struct device_node *cpu_to_l2cache(int cpu) |