git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b24e8c)
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)
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 patch | blob | history

diff --cc arch/x86/kernel/cpu/perf_event.h
Simple merge
Pandora Kernel Repository