diff options
author | Dave Jones <davej@redhat.com> | 2010-11-23 21:29:31 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2011-03-01 18:49:44 -0500 |
commit | a536b126f211bdf9a0eecce0d403a26900d2106c (patch) | |
tree | 50571a71a0109bd0a99528c715dc2d746c80568d /arch | |
parent | ac818314499b707a97690d5ee835e6ba40a407c1 (diff) | |
download | linux-3.10-a536b126f211bdf9a0eecce0d403a26900d2106c.tar.gz linux-3.10-a536b126f211bdf9a0eecce0d403a26900d2106c.tar.bz2 linux-3.10-a536b126f211bdf9a0eecce0d403a26900d2106c.zip |
[CPUFREQ] Fix another notifier leak in powernow-k8.
Do the notifier registration later, so we don't have to worry
about freeing it if we fail the msr allocation.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index 302963fb4dc..c567dec854f 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c @@ -1556,14 +1556,14 @@ static int __cpuinit powernowk8_init(void) cpb_capable = true; - register_cpu_notifier(&cpb_nb); - msrs = msrs_alloc(); if (!msrs) { printk(KERN_ERR "%s: Error allocating msrs!\n", __func__); return -ENOMEM; } + register_cpu_notifier(&cpb_nb); + rdmsr_on_cpus(cpu_online_mask, MSR_K7_HWCR, msrs); for_each_cpu(cpu, cpu_online_mask) { |