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

Commit c857eb56 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf/x86: Fix hw_perf_event::flags collision 



Somehow we ended up with overlapping flags when merging the
RDPMC control flag - this is bad, fix it.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5b24e8cf

arch/x86/kernel/cpu/perf_event.h

+9 −9
Original line number Diff line number Diff line
@@ -65,15 +65,15 @@ struct event_constraint { 
/*

 * struct hw_perf_event.flags flags

 */

#define PERF_X86_EVENT_PEBS_LDLAT	0x1 /* ld+ldlat data address sampling */

#define PERF_X86_EVENT_PEBS_ST		0x2 /* st data address sampling */

#define PERF_X86_EVENT_PEBS_ST_HSW	0x4 /* haswell style datala, store */

#define PERF_X86_EVENT_COMMITTED	0x8 /* event passed commit_txn */

#define PERF_X86_EVENT_PEBS_LD_HSW	0x10 /* haswell style datala, load */

#define PERF_X86_EVENT_PEBS_NA_HSW	0x20 /* haswell style datala, unknown */

#define PERF_X86_EVENT_EXCL		0x40 /* HT exclusivity on counter */

#define PERF_X86_EVENT_DYNAMIC		0x80 /* dynamic alloc'd constraint */

#define PERF_X86_EVENT_RDPMC_ALLOWED	0x40 /* grant rdpmc permission */

#define PERF_X86_EVENT_PEBS_LDLAT	0x0001 /* ld+ldlat data address sampling */

#define PERF_X86_EVENT_PEBS_ST		0x0002 /* st data address sampling */

#define PERF_X86_EVENT_PEBS_ST_HSW	0x0004 /* haswell style datala, store */

#define PERF_X86_EVENT_COMMITTED	0x0008 /* event passed commit_txn */

#define PERF_X86_EVENT_PEBS_LD_HSW	0x0010 /* haswell style datala, load */

#define PERF_X86_EVENT_PEBS_NA_HSW	0x0020 /* haswell style datala, unknown */

#define PERF_X86_EVENT_EXCL		0x0040 /* HT exclusivity on counter */

#define PERF_X86_EVENT_DYNAMIC		0x0080 /* dynamic alloc'd constraint */

#define PERF_X86_EVENT_RDPMC_ALLOWED	0x0100 /* grant rdpmc permission */





struct amd_nb {