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>

3 files changed, 5 insertions, 5 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)
 #endif
 
         /* SMP Init has to be done early as we need to patch up
-         * cpu_possible_map before interrupt stacks are allocated
+         * cpu_possible_mask before interrupt stacks are allocated
          * or kaboom...
          */
 #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)
         /* This is necessary because OF doesn't know about the
          * secondary cpu(s), and thus there aren't nodes in the
          * device tree for them, and smp_setup_cpu_maps hasn't
-         * set their bits in cpu_present_map.
+         * set their bits in cpu_present_mask.
          */
         if (ncpus > NR_CPUS)
                 ncpus = NR_CPUS;
@@ -944,7 +944,7 @@ void __init pmac_setup_smp(void)
         }
 #ifdef CONFIG_PPC32
         else {
-                /* We have to set bits in cpu_possible_map here since the
+                /* We have to set bits in cpu_possible_mask here since the
                  * secondary CPU(s) aren't in the device tree. Various
                  * things won't be initialized for CPUs not in the possible
                  * 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)
 }
 
 /*
- * Update cpu_present_map and paca(s) for a new cpu node.  The wrinkle
+ * Update cpu_present_mask and paca(s) for a new cpu node.  The wrinkle
  * here is that a cpu device node may represent up to two logical cpus
  * in the SMT case.  We must honor the assumption in other code that
  * 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)
                         cpumask_shift_left(tmp, tmp, nthreads);
 
         if (cpumask_empty(tmp)) {
-                printk(KERN_ERR "Unable to find space in cpu_present_map for"
+                printk(KERN_ERR "Unable to find space in cpu_present_mask for"
                        " processor %s with %d thread(s)\n", np->name,
                        nthreads);
                 goto out_unlock;