diff options
author | Anton Blanchard <anton@samba.org> | 2010-04-26 11:32:44 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 03:41:59 -0400 |
commit | 828a69869ba266cabb486a6b59ea8643d56b33ce (patch) | |
tree | 06fdb4a69c6c0e8baf4624979f85f85cbebb8163 /arch | |
parent | 25863de07af9cb90e6365cc8216bdd17f2394515 (diff) |
powerpc/cpumask: Update some comments
Since the *_map cpumask variants are deprecated, change the comments to
instead refer to *_mask.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 6 | ||||
-rw-r--r-- | arch/powerpc/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/smp.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 |
5 files changed, 9 insertions, 9 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) |
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. |
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 235f363f732d..8f85f399ab9f 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c | |||
@@ -222,7 +222,7 @@ static void pseries_cpu_die(unsigned int cpu) | |||
222 | } | 222 | } |
223 | 223 | ||
224 | /* | 224 | /* |
225 | * Update cpu_present_map and paca(s) for a new cpu node. The wrinkle | 225 | * Update cpu_present_mask and paca(s) for a new cpu node. The wrinkle |
226 | * here is that a cpu device node may represent up to two logical cpus | 226 | * here is that a cpu device node may represent up to two logical cpus |
227 | * in the SMT case. We must honor the assumption in other code that | 227 | * in the SMT case. We must honor the assumption in other code that |
228 | * the logical ids for sibling SMT threads x and y are adjacent, such | 228 | * the logical ids for sibling SMT threads x and y are adjacent, such |
@@ -270,7 +270,7 @@ static int pseries_add_processor(struct device_node *np) | |||
270 | cpumask_shift_left(tmp, tmp, nthreads); | 270 | cpumask_shift_left(tmp, tmp, nthreads); |
271 | 271 | ||
272 | if (cpumask_empty(tmp)) { | 272 | if (cpumask_empty(tmp)) { |
273 | printk(KERN_ERR "Unable to find space in cpu_present_map for" | 273 | printk(KERN_ERR "Unable to find space in cpu_present_mask for" |
274 | " processor %s with %d thread(s)\n", np->name, | 274 | " processor %s with %d thread(s)\n", np->name, |
275 | nthreads); | 275 | nthreads); |
276 | goto out_unlock; | 276 | goto out_unlock; |