Commit fa11c280 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5cc47d4a 8b4dd2d8

arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static struct event_constraint intel_icl_event_constraints[] = { 
	INTEL_EVENT_CONSTRAINT_RANGE(0x03, 0x0a, 0xf),

	INTEL_EVENT_CONSTRAINT_RANGE(0x1f, 0x28, 0xf),

	INTEL_EVENT_CONSTRAINT(0x32, 0xf),	/* SW_PREFETCH_ACCESS.* */

	INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x54, 0xf),

	INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x56, 0xf),

	INTEL_EVENT_CONSTRAINT_RANGE(0x60, 0x8b, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x04a3, 0xff),  /* CYCLE_ACTIVITY.STALLS_TOTAL */

	INTEL_UEVENT_CONSTRAINT(0x10a3, 0xff),  /* CYCLE_ACTIVITY.CYCLES_MEM_ANY */

kernel/events/core.c

+0 −1
Original line number Diff line number Diff line
@@ -4257,7 +4257,6 @@ static void perf_event_remove_on_exec(int ctxn) 
{

	struct perf_event_context *ctx, *clone_ctx = NULL;

	struct perf_event *event, *next;

	LIST_HEAD(free_list);

	unsigned long flags;

	bool modified = false;