3 files changed, 8 insertions, 3 deletions

diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 8efd33753ad3..d35c490a91cb 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1671,9 +1671,12 @@ static bool __init supported_pmu(void)
 
 static int __init init_hw_perf_events(void)
 {
+        int err;
+
         pr_info("Performance events: ");
 
-        if (!supported_pmu()) {
+        err = pcr_arch_init();
+        if (err || !supported_pmu()) {
                 pr_cont("No support for PMU type '%s'\n", sparc_pmu_type);
                 return 0;
         }
@@ -1685,7 +1688,7 @@ static int __init init_hw_perf_events(void)
 
         return 0;
 }
-early_initcall(init_hw_perf_events);
+pure_initcall(init_hw_perf_events);
 
 void perf_callchain_kernel(struct perf_callchain_entry *entry,
                            struct pt_regs *regs)
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 027e09986194..0be7bf978cb1 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -312,6 +312,9 @@ static void __global_pmu_self(int this_cpu)
         struct global_pmu_snapshot *pp;
         int i, num;
 
+        if (!pcr_ops)
+                return;
+
         pp = &global_cpu_snapshot[this_cpu].pmu;
 
         num = 1;
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 41aa2478f3ca..f7ba87543e5f 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1383,7 +1383,6 @@ void __cpu_die(unsigned int cpu)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-        pcr_arch_init();
 }
 
 void smp_send_reschedule(int cpu)