diff --git a/[refs] b/[refs]
index cfa0a0d38f9f..fc16fc2b9eb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cf5f4323b1b51ecca3e952f95110e03ea611882
+refs/heads/master: 94f4db3590893c600506105b88dab581c7f6f5c8
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/trunk/arch/x86/kernel/cpu/perf_event_amd_uncore.c
index 6dc62273639c..c0c661adf03e 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_amd_uncore.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_amd_uncore.c
@@ -498,7 +498,6 @@ static void __init init_cpu_already_online(void *dummy)
 {
 	unsigned int cpu = smp_processor_id();
 
-	amd_uncore_cpu_up_prepare(cpu);
 	amd_uncore_cpu_starting(cpu);
 	amd_uncore_cpu_online(cpu);
 }
@@ -535,8 +534,10 @@ static int __init amd_uncore_init(void)
 
 	get_online_cpus();
 	/* init cpus already online before registering for hotplug notifier */
-	for_each_online_cpu(cpu)
+	for_each_online_cpu(cpu) {
+		amd_uncore_cpu_up_prepare(cpu);
 		smp_call_function_single(cpu, init_cpu_already_online, NULL, 1);
+	}
 
 	register_cpu_notifier(&amd_uncore_cpu_notifier_block);
 	put_online_cpus();