Merge tag 'perf-urgent-2025-11-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit e624f7377599 · 2025-11-23T08:20:15.000-08:00
Pull perf fixes from Ingo Molnar:
 "Fix perf CPU-clock counters, and address a static checker warning"

* tag 'perf-urgent-2025-11-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Fix 0 count issue of cpu-clock
  perf/x86/intel/uncore: Remove superfluous check
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
@@ -1325,8 +1325,6 @@ static void uncore_pci_sub_driver_init(void)
 				continue;
 
 			pmu = &type->pmus[UNCORE_PCI_DEV_IDX(ids->driver_data)];
-			if (!pmu)
-				continue;
 
 			if (uncore_pci_get_dev_die_info(pci_sub_dev, &die))
 				continue;
diff --git a/kernel/events/core.c b/kernel/events/core.c
@@ -11901,7 +11901,7 @@ static int cpu_clock_event_add(struct perf_event *event, int flags)
 
 static void cpu_clock_event_del(struct perf_event *event, int flags)
 {
-	cpu_clock_event_stop(event, flags);
+	cpu_clock_event_stop(event, PERF_EF_UPDATE);
 }
 
 static void cpu_clock_event_read(struct perf_event *event)

Original file line number	Diff line number	Diff line change
`@@ -11901,7 +11901,7 @@ static int cpu_clock_event_add(struct perf_event *event, int flags)`
`11901`	`11901`
`11902`	`11902`	`static void cpu_clock_event_del(struct perf_event *event, int flags)`
`11903`	`11903`	`{`
`11904`		`- cpu_clock_event_stop(event, flags);`
	`11904`	`+ cpu_clock_event_stop(event, PERF_EF_UPDATE);`
`11905`	`11905`	`}`
`11906`	`11906`
`11907`	`11907`	`static void cpu_clock_event_read(struct perf_event *event)`