Commit 8dca15e4 authored by Rusty Russell's avatar Rusty Russell Committed by Dave Jones
Browse files

[CPUFREQ] speedstep-ich: fix error caused by 394122ab

"[CPUFREQ] cpumask: avoid playing with cpus_allowed in speedstep-ich.c"
changed the code to mistakenly pass the current cpu as the "processor"
argument of speedstep_get_frequency(), whereas it should be the type of
the processor.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14340



Based on a patch by Dave Mueller.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarDominik Brodowski <linux@brodo.de>
Reported-by: David Müller's avatarDave Mueller <dave.mueller@gmx.ch>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent e77b89f1
...@@ -232,28 +232,23 @@ static unsigned int speedstep_detect_chipset(void) ...@@ -232,28 +232,23 @@ static unsigned int speedstep_detect_chipset(void)
return 0; return 0;
} }
struct get_freq_data { static void get_freq_data(void *_speed)
unsigned int speed;
unsigned int processor;
};
static void get_freq_data(void *_data)
{ {
struct get_freq_data *data = _data; unsigned int *speed = _speed;
data->speed = speedstep_get_frequency(data->processor); *speed = speedstep_get_frequency(speedstep_processor);
} }
static unsigned int speedstep_get(unsigned int cpu) static unsigned int speedstep_get(unsigned int cpu)
{ {
struct get_freq_data data = { .processor = cpu }; unsigned int speed;
/* You're supposed to ensure CPU is online. */ /* You're supposed to ensure CPU is online. */
if (smp_call_function_single(cpu, get_freq_data, &data, 1) != 0) if (smp_call_function_single(cpu, get_freq_data, &speed, 1) != 0)
BUG(); BUG();
dprintk("detected %u kHz as current frequency\n", data.speed); dprintk("detected %u kHz as current frequency\n", speed);
return data.speed; return speed;
} }
/** /**
......
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