Merge tag 'perf-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Thomas Gleixner:

- Make the ICL event constraints match reality

- Remove a unused local variable

* tag 'perf-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: Remove unused local variable
perf/x86/intel: Fix event constraints for ICL

+1 -2
+1 -1
arch/x86/events/intel/core.c
··· 276 276 INTEL_EVENT_CONSTRAINT_RANGE(0x03, 0x0a, 0xf), 277 277 INTEL_EVENT_CONSTRAINT_RANGE(0x1f, 0x28, 0xf), 278 278 INTEL_EVENT_CONSTRAINT(0x32, 0xf), /* SW_PREFETCH_ACCESS.* */ 279 - INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x54, 0xf), 279 + INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x56, 0xf), 280 280 INTEL_EVENT_CONSTRAINT_RANGE(0x60, 0x8b, 0xf), 281 281 INTEL_UEVENT_CONSTRAINT(0x04a3, 0xff), /* CYCLE_ACTIVITY.STALLS_TOTAL */ 282 282 INTEL_UEVENT_CONSTRAINT(0x10a3, 0xff), /* CYCLE_ACTIVITY.CYCLES_MEM_ANY */
-1
kernel/events/core.c
··· 4257 4257 { 4258 4258 struct perf_event_context *ctx, *clone_ctx = NULL; 4259 4259 struct perf_event *event, *next; 4260 - LIST_HEAD(free_list); 4261 4260 unsigned long flags; 4262 4261 bool modified = false; 4263 4262