From 2fc844a5e894eff4de0bb974dafe00b653faec54 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 23 Nov 2010 21:29:31 -0500
Subject: [PATCH] --- yaml --- r: 233766 b: refs/heads/master c:
 a536b126f211bdf9a0eecce0d403a26900d2106c h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 849e7449508f..43ea8e8aff6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac818314499b707a97690d5ee835e6ba40a407c1
+refs/heads/master: a536b126f211bdf9a0eecce0d403a26900d2106c
diff --git a/trunk/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/trunk/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 302963fb4dc3..c567dec854f6 100644
--- a/trunk/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/trunk/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) {