Commit e624f737 authored Nov 23, 2025 by Linus Torvalds

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

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

parents d13f3ac6 f1f96511

arch/x86/events/intel/uncore.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;

kernel/events/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)