Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1070d5ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fix from Ingo Molnar:
 "An x86/intel event constraint fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix constraint table end marker bug
parents 0eda4020 cf30d52e

arch/x86/kernel/cpu/perf_event.h

+12 −3
Original line number Diff line number Diff line
@@ -262,11 +262,20 @@ struct cpu_hw_events { 
	__EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK, \

			  HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_ST_HSW)



#define EVENT_CONSTRAINT_END		\

	EVENT_CONSTRAINT(0, 0, 0)

/*

 * We define the end marker as having a weight of -1

 * to enable blacklisting of events using a counter bitmask

 * of zero and thus a weight of zero.

 * The end marker has a weight that cannot possibly be

 * obtained from counting the bits in the bitmask.

 */

#define EVENT_CONSTRAINT_END { .weight = -1 }



/*

 * Check for end marker with weight == -1

 */

#define for_each_event_constraint(e, c)	\

	for ((e) = (c); (e)->weight; (e)++)

	for ((e) = (c); (e)->weight != -1; (e)++)



/*

 * Extra registers for specific events.