4 files changed, 5 insertions, 5 deletions

diff --git a/init/main.c b/init/main.c
index 6bf83afd654d..1ac7ec78e601 100644
--- a/init/main.c
+++ b/init/main.c
@@ -842,7 +842,7 @@ static int __init kernel_init(void * unused)
         /*
          * init can run on any cpu.
          */
-        set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR);
+        set_cpus_allowed_ptr(current, cpu_all_mask);
         /*
          * Tell the world that we're going to be the grim
          * reaper of innocent orphaned children.
diff --git a/kernel/kmod.c b/kernel/kmod.c
index a27a5f64443d..f0c8f545180d 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -167,7 +167,7 @@ static int ____call_usermodehelper(void *data)
         }
 
         /* We can run anywhere, unlike our parent keventd(). */
-        set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR);
+        set_cpus_allowed_ptr(current, cpu_all_mask);
 
         /*
          * Our parent is keventd, which runs with elevated scheduling priority.
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 4fbc456f393d..84bbadd4d021 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -110,7 +110,7 @@ static void create_kthread(struct kthread_create_info *create)
                  */
                 sched_setscheduler(create->result, SCHED_NORMAL, &param);
                 set_user_nice(create->result, KTHREAD_NICE_LEVEL);
-                set_cpus_allowed_ptr(create->result, CPU_MASK_ALL_PTR);
+                set_cpus_allowed_ptr(create->result, cpu_all_mask);
         }
         complete(&create->done);
 }
@@ -240,7 +240,7 @@ int kthreadd(void *unused)
         set_task_comm(tsk, "kthreadd");
         ignore_signals(tsk);
         set_user_nice(tsk, KTHREAD_NICE_LEVEL);
-        set_cpus_allowed_ptr(tsk, CPU_MASK_ALL_PTR);
+        set_cpus_allowed_ptr(tsk, cpu_all_mask);
 
         current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG;
 
diff --git a/mm/pdflush.c b/mm/pdflush.c
index 15de509b68fd..118905e3d788 100644
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -191,7 +191,7 @@ static int pdflush(void *dummy)
 
         /*
          * Some configs put our parent kthread in a limited cpuset,
-         * which kthread() overrides, forcing cpus_allowed == CPU_MASK_ALL.
+         * which kthread() overrides, forcing cpus_allowed == cpu_all_mask.
          * Our needs are more modest - cut back to our cpusets cpus_allowed.
          * This is needed as pdflush's are dynamically created and destroyed.
          * The boottime pdflush's are easily placed w/o these 2 lines.