diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-23 08:20:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-23 08:20:15 -0800 |
| commit | e624f7377599d1f82190b17bdf7d8e735c0576ee (patch) | |
| tree | 224c7044ed8949457b25c684a2560a284a0db751 | |
| parent | d13f3ac64efb868d09cb2726b1e84929afe90235 (diff) | |
| parent | f1f96511b1c4c33e53f05909dd267878e0643a9a (diff) | |
| download | bpf-e624f7377599d1f82190b17bdf7d8e735c0576ee.tar.gz | |
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
| -rw-r--r-- | arch/x86/events/intel/uncore.c | 2 | ||||
| -rw-r--r-- | kernel/events/core.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index d6c945cc5d07c2..e228e564b15ea6 100644 --- 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 index 1fd347da902654..2c35acc2722b0f 100644 --- 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) |