Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 129958
b: refs/heads/master
c: bfa318a
h: refs/heads/master
v: v3
  • Loading branch information
Ingo Molnar committed Jan 19, 2009
1 parent 77ba263 commit b189f2a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72859081851af2bda04117ca3d64206ffa199e5e
refs/heads/master: bfa318ad52a23f1e303d176b44366cdd2bb71ad2
11 changes: 4 additions & 7 deletions trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ typedef union {

struct drv_cmd {
unsigned int type;
cpumask_var_t mask;
const struct cpumask *mask;
drv_addr_union addr;
u32 val;
};
Expand Down Expand Up @@ -231,6 +231,7 @@ static u32 get_cur_val(const struct cpumask *mask)
return 0;
}

cmd.mask = mask;
drv_read(&cmd);

dprintk("get_cur_val = %u\n", cmd.val);
Expand Down Expand Up @@ -397,9 +398,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
return -ENODEV;
}

if (unlikely(!alloc_cpumask_var(&cmd.mask, GFP_KERNEL)))
return -ENOMEM;

perf = data->acpi_data;
result = cpufreq_frequency_table_target(policy,
data->freq_table,
Expand Down Expand Up @@ -444,9 +442,9 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,

/* cpufreq holds the hotplug lock, so we are safe from here on */
if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)
cpumask_and(cmd.mask, cpu_online_mask, policy->cpus);
cmd.mask = policy->cpus;
else
cpumask_copy(cmd.mask, cpumask_of(policy->cpu));
cmd.mask = cpumask_of(policy->cpu);

freqs.old = perf->states[perf->state].core_frequency * 1000;
freqs.new = data->freq_table[next_state].frequency;
Expand All @@ -473,7 +471,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
perf->state = next_perf_state;

out:
free_cpumask_var(cmd.mask);
return result;
}

Expand Down

0 comments on commit b189f2a

Please sign in to comment.