Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[pandora-kernel.git] / arch / ia64 / kernel / cpufreq / acpi-cpufreq.c

diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index b0b4e6e..22f6152 100644 (file)
--- 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);
 }