Skip to content

Commit fa11c28

Browse files
committed
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
2 parents 5cc47d4 + 8b4dd2d commit fa11c28

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

arch/x86/events/intel/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static struct event_constraint intel_icl_event_constraints[] = {
276276
INTEL_EVENT_CONSTRAINT_RANGE(0x03, 0x0a, 0xf),
277277
INTEL_EVENT_CONSTRAINT_RANGE(0x1f, 0x28, 0xf),
278278
INTEL_EVENT_CONSTRAINT(0x32, 0xf), /* SW_PREFETCH_ACCESS.* */
279-
INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x54, 0xf),
279+
INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x56, 0xf),
280280
INTEL_EVENT_CONSTRAINT_RANGE(0x60, 0x8b, 0xf),
281281
INTEL_UEVENT_CONSTRAINT(0x04a3, 0xff), /* CYCLE_ACTIVITY.STALLS_TOTAL */
282282
INTEL_UEVENT_CONSTRAINT(0x10a3, 0xff), /* CYCLE_ACTIVITY.CYCLES_MEM_ANY */

kernel/events/core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4257,7 +4257,6 @@ static void perf_event_remove_on_exec(int ctxn)
42574257
{
42584258
struct perf_event_context *ctx, *clone_ctx = NULL;
42594259
struct perf_event *event, *next;
4260-
LIST_HEAD(free_list);
42614260
unsigned long flags;
42624261
bool modified = false;
42634262

0 commit comments

Comments
 (0)