perf/x86: Fix hw_perf_event::flags collision
authorPeter Zijlstra <peterz@infradead.org>
Wed, 15 Apr 2015 18:14:53 +0000 (20:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 17 Apr 2015 07:50:43 +0000 (09:50 +0200)
commitc857eb56e6e8e53dccd8d1e7ea90bcaf3311996d
treef788cbdffcc77bf876de04acdf5b555f65e566d3
parent5b24e8cf618f03b4f1275c229d0a1d464648f9e2
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: Peter 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: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.h