diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-08 13:33:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-08 13:33:31 -0800 |
| commit | 8defcaa6ba157f215c437939c3adcd1dbfa1a8fa (patch) | |
| tree | 30da23f953a8de09dfc3f10fa216540a8b205b52 /arch/x86 | |
| parent | 08c4f1b096cc2468908ea58a77d2ef92ef765c52 (diff) | |
| parent | 1dbf58881f307e21a3df4b990a5bea401360d02e (diff) | |
| download | blackbird-op-linux-8defcaa6ba157f215c437939c3adcd1dbfa1a8fa.tar.gz blackbird-op-linux-8defcaa6ba157f215c437939c3adcd1dbfa1a8fa.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 ondemand to not request targets outside policy limits
[CPUFREQ] Fix use after free of struct powernow_k8_data
[CPUFREQ] fix default value for ondemand governor
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index f125e5c551c0..6e44519960c8 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c @@ -1356,6 +1356,7 @@ static int __devexit powernowk8_cpu_exit(struct cpufreq_policy *pol) kfree(data->powernow_table); kfree(data); + per_cpu(powernow_data, pol->cpu) = NULL; return 0; } @@ -1375,7 +1376,7 @@ static unsigned int powernowk8_get(unsigned int cpu) int err; if (!data) - return -EINVAL; + return 0; smp_call_function_single(cpu, query_values_on_cpu, &err, true); if (err) |
