1 files changed, 9 insertions, 12 deletions

diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
index f0ea6fa2f53c..d2cc4991cbaa 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,9 +491,7 @@ 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;
 
@@ -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;
 }