perf fix
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: cf30d52e2d11523c42048ab89ed4215b5021526a perf/x86: Fix constraint table end marker bug
An x86/intel event constraint fix.
Thanks,
Ingo
------------------>
Maria Dimakopoulou (1):
perf/x86: Fix constraint table end marker bug
arch/x86/kernel/cpu/perf_event.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event.h +12 -3
@@ -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.