diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 18:49:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 18:49:49 -0800 |
| commit | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (patch) | |
| tree | 5aefcbf687c496de317693934111010635a82d20 /arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | |
| parent | strcmp: fix overflow and possibly signedness error (diff) | |
| parent | [CPUFREQ] Fix stale cpufreq_cpu_governor pointer (diff) | |
| download | linux-dev-66b00a7c93ec782d118d2c03bd599cfd041e80a1.tar.xz linux-dev-66b00a7c93ec782d118d2c03bd599cfd041e80a1.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Fix stale cpufreq_cpu_governor pointer
[CPUFREQ] Resolve time unit thinko in ondemand/conservative govs
[CPUFREQ] speedstep-ich: fix error caused by 394122ab144dae4b276d74644a2f11c44a60ac5c
[CPUFREQ] Fix use after free on governor restore
[CPUFREQ] acpi-cpufreq: blacklist Intel 0f68: Fix HT detection and put in notification message
[CPUFREQ] powernow-k8: Fix test in get_transition_latency()
[CPUFREQ] longhaul: select Longhaul version 2 for capable CPUs
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/speedstep-ich.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c index 6911e91fb4f6..3ae5a7a3a500 100644 --- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c +++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c @@ -232,28 +232,23 @@ static unsigned int speedstep_detect_chipset(void) return 0; } -struct get_freq_data { - unsigned int speed; - unsigned int processor; -}; - -static void get_freq_data(void *_data) +static void get_freq_data(void *_speed) { - 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) { - struct get_freq_data data = { .processor = cpu }; + unsigned int speed; /* 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(); - dprintk("detected %u kHz as current frequency\n", data.speed); - return data.speed; + dprintk("detected %u kHz as current frequency\n", speed); + return speed; } /** |