diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index fc436fbb053f930b2a3385f2d4850db28c551db0..b07ce3ee2199a196d36aa6a44ec65e3a93007602 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1520,18 +1520,21 @@ void perf_event_print_debug(void)
 {
 	u64 ctrl, status, overflow, pmc_ctrl, pmc_count, prev_left, fixed;
 	u64 pebs, debugctl;
-	int cpu = smp_processor_id();
-	struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);
-	int num_counters = hybrid(cpuc->pmu, num_counters);
-	int num_counters_fixed = hybrid(cpuc->pmu, num_counters_fixed);
-	struct event_constraint *pebs_constraints = hybrid(cpuc->pmu, pebs_constraints);
-	unsigned long flags;
-	int idx;
+	struct cpu_hw_events *cpuc;
+	struct event_constraint *pebs_constraints;
+	int num_counters, num_counters_fixed, cpu, idx;
+
+	guard(irqsave)();
+
+	cpu = smp_processor_id();
+	cpuc = &per_cpu(cpu_hw_events, cpu);
+	num_counters = hybrid(cpuc->pmu, num_counters);
+	num_counters_fixed = hybrid(cpuc->pmu, num_counters_fixed);
+	pebs_constraints = hybrid(cpuc->pmu, pebs_constraints);
 
 	if (!num_counters)
 		return;
 
-	local_irq_save(flags);
 
 	if (x86_pmu.version >= 2) {
 		rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
@@ -1576,7 +1579,6 @@ void perf_event_print_debug(void)
 		pr_info("CPU#%d: fixed-PMC%d count: %016llx\n",
 			cpu, idx, pmc_count);
 	}
-	local_irq_restore(flags);
 }
 
 void x86_pmu_stop(struct perf_event *event, int flags)