Commit 30e24c39 authored by Russell King's avatar Russell King

[ARM] Fix Integrator CPUFREQ support.

CPU masks are now contained within cpumask_t and must be manipulated
with associated functions.
parent 8b9d266a
...@@ -79,7 +79,7 @@ static int integrator_set_target(struct cpufreq_policy *policy, ...@@ -79,7 +79,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
unsigned int target_freq, unsigned int target_freq,
unsigned int relation) unsigned int relation)
{ {
unsigned long cpus_allowed; cpumask_t cpus_allowed;
int cpu = policy->cpu; int cpu = policy->cpu;
struct icst525_vco vco; struct icst525_vco vco;
struct cpufreq_freqs freqs; struct cpufreq_freqs freqs;
...@@ -94,7 +94,7 @@ static int integrator_set_target(struct cpufreq_policy *policy, ...@@ -94,7 +94,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
* Bind to the specified CPU. When this call returns, * Bind to the specified CPU. When this call returns,
* we should be running on the right CPU. * we should be running on the right CPU.
*/ */
set_cpus_allowed(current, 1 << cpu); set_cpus_allowed(current, cpumask_of_cpu(cpu));
BUG_ON(cpu != smp_processor_id()); BUG_ON(cpu != smp_processor_id());
/* get current setting */ /* get current setting */
...@@ -154,14 +154,14 @@ static int integrator_set_target(struct cpufreq_policy *policy, ...@@ -154,14 +154,14 @@ static int integrator_set_target(struct cpufreq_policy *policy,
static unsigned int integrator_get(unsigned int cpu) static unsigned int integrator_get(unsigned int cpu)
{ {
unsigned long cpus_allowed; cpumask_t cpus_allowed;
unsigned int current_freq; unsigned int current_freq;
u_int cm_osc; u_int cm_osc;
struct icst525_vco vco; struct icst525_vco vco;
cpus_allowed = current->cpus_allowed; cpus_allowed = current->cpus_allowed;
set_cpus_allowed(current, 1 << cpu); set_cpus_allowed(current, cpumask_of_cpu(cpu));
BUG_ON(cpu != smp_processor_id()); BUG_ON(cpu != smp_processor_id());
/* detect memory etc. */ /* detect memory etc. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment