1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
index 6dc62273639c..c0c661adf03e 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_uncore.c
+++ b/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();