3 files changed, 9 insertions, 10 deletions

diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index b0b4e6e710f2..22f61526a8e1 100644
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
@@ -113,7 +113,7 @@ processor_get_freq (
         dprintk("processor_get_freq\n");
 
         saved_mask = current->cpus_allowed;
-        set_cpus_allowed(current, cpumask_of_cpu(cpu));
+        set_cpus_allowed_ptr(current, cpumask_of(cpu));
         if (smp_processor_id() != cpu)
                 goto migrate_end;
 
@@ -121,7 +121,7 @@ processor_get_freq (
         ret = processor_get_pstate(&value);
 
         if (ret) {
-                set_cpus_allowed(current, saved_mask);
+                set_cpus_allowed_ptr(current, &saved_mask);
                 printk(KERN_WARNING "get performance failed with error %d\n",
                        ret);
                 ret = 0;
@@ -131,7 +131,7 @@ processor_get_freq (
         ret = (clock_freq*1000);
 
 migrate_end:
-        set_cpus_allowed(current, saved_mask);
+        set_cpus_allowed_ptr(current, &saved_mask);
         return ret;
 }
 
@@ -151,7 +151,7 @@ processor_set_freq (
         dprintk("processor_set_freq\n");
 
         saved_mask = current->cpus_allowed;
-        set_cpus_allowed(current, cpumask_of_cpu(cpu));
+        set_cpus_allowed_ptr(current, cpumask_of(cpu));
         if (smp_processor_id() != cpu) {
                 retval = -EAGAIN;
                 goto migrate_end;
@@ -208,7 +208,7 @@ processor_set_freq (
         retval = 0;
 
 migrate_end:
-        set_cpus_allowed(current, saved_mask);
+        set_cpus_allowed_ptr(current, &saved_mask);
         return (retval);
 }
 
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index e6676fca4828..aa8b5fa1a8de 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -404,10 +404,9 @@ static void
 call_on_cpu(int cpu, void (*fn)(void *), void *arg)
 {
         cpumask_t save_cpus_allowed = current->cpus_allowed;
-        cpumask_t new_cpus_allowed = cpumask_of_cpu(cpu);
-        set_cpus_allowed(current, new_cpus_allowed);
+        set_cpus_allowed_ptr(current, cpumask_of(cpu));
         (*fn)(arg);
-        set_cpus_allowed(current, save_cpus_allowed);
+        set_cpus_allowed_ptr(current, &save_cpus_allowed);
 }
 
 static void
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 28f299de2903..0baa1bbb65fe 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -361,12 +361,12 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
                 return 0;
 
         oldmask = current->cpus_allowed;
-        retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));
+        retval = set_cpus_allowed_ptr(current, cpumask_of(cpu));
         if (unlikely(retval))
                 return retval;
 
         retval = cpu_cache_sysfs_init(cpu);
-        set_cpus_allowed(current, oldmask);
+        set_cpus_allowed_ptr(current, &oldmask);
         if (unlikely(retval < 0))
                 return retval;