Merge branch 'linus' into core/iommu

1 files changed, 16 insertions, 19 deletions

diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
index f0ea6fa2f53..f08998278a3 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -458,11 +458,6 @@ static int centrino_verify (struct cpufreq_policy *policy)
  *
  * Sets a new CPUFreq policy.
  */
-struct allmasks {
-        cpumask_t               saved_mask;
-        cpumask_t               covered_cpus;
-};
-
 static int centrino_target (struct cpufreq_policy *policy,
                             unsigned int target_freq,
                             unsigned int relation)
@@ -472,12 +467,15 @@ static int centrino_target (struct cpufreq_policy *policy,
         struct cpufreq_freqs    freqs;
         int                     retval = 0;
         unsigned int            j, k, first_cpu, tmp;
-        CPUMASK_ALLOC(allmasks);
-        CPUMASK_PTR(saved_mask, allmasks);
-        CPUMASK_PTR(covered_cpus, allmasks);
+        cpumask_var_t saved_mask, covered_cpus;
 
-        if (unlikely(allmasks == NULL))
+        if (unlikely(!alloc_cpumask_var(&saved_mask, GFP_KERNEL)))
                 return -ENOMEM;
+        if (unlikely(!alloc_cpumask_var(&covered_cpus, GFP_KERNEL))) {
+                free_cpumask_var(saved_mask);
+                return -ENOMEM;
+        }
+        cpumask_copy(saved_mask, &current->cpus_allowed);
 
         if (unlikely(per_cpu(centrino_model, cpu) == NULL)) {
                 retval = -ENODEV;
@@ -493,11 +491,9 @@ static int centrino_target (struct cpufreq_policy *policy,
                 goto out;
         }
 
-        *saved_mask = current->cpus_allowed;
         first_cpu = 1;
-        cpus_clear(*covered_cpus);
-        for_each_cpu_mask_nr(j, policy->cpus) {
-                const cpumask_t *mask;
+        for_each_cpu(j, policy->cpus) {
+                const struct cpumask *mask;
 
                 /* cpufreq holds the hotplug lock, so we are safe here */
                 if (!cpu_online(j))
@@ -508,9 +504,9 @@ static int centrino_target (struct cpufreq_policy *policy,
                  * Make sure we are running on CPU that wants to change freq
                  */
                 if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        mask = &policy->cpus;
+                        mask = policy->cpus;
                 else
-                        mask = &cpumask_of_cpu(j);
+                        mask = cpumask_of(j);
 
                 set_cpus_allowed_ptr(current, mask);
                 preempt_disable();
@@ -542,7 +538,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                         dprintk("target=%dkHz old=%d new=%d msr=%04x\n",
                                 target_freq, freqs.old, freqs.new, msr);
 
-                        for_each_cpu_mask_nr(k, policy->cpus) {
+                        for_each_cpu(k, policy->cpus) {
                                 if (!cpu_online(k))
                                         continue;
                                 freqs.cpu = k;
@@ -567,7 +563,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                 preempt_enable();
         }
 
-        for_each_cpu_mask_nr(k, policy->cpus) {
+        for_each_cpu(k, policy->cpus) {
                 if (!cpu_online(k))
                         continue;
                 freqs.cpu = k;
@@ -590,7 +586,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                 tmp = freqs.new;
                 freqs.new = freqs.old;
                 freqs.old = tmp;
-                for_each_cpu_mask_nr(j, policy->cpus) {
+                for_each_cpu(j, policy->cpus) {
                         if (!cpu_online(j))
                                 continue;
                         cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
@@ -605,7 +601,8 @@ migrate_end:
         preempt_enable();
         set_cpus_allowed_ptr(current, saved_mask);
 out:
-        CPUMASK_FREE(allmasks);
+        free_cpumask_var(saved_mask);
+        free_cpumask_var(covered_cpus);
         return retval;
 }