From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 15 Apr 2015 18:14:53 +0000 (+0200)
Subject: perf/x86: Fix hw_perf_event::flags collision
X-Git-Tag: omap-for-v4.1/fixes-rc1~97^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c857eb56e6e8e53dccd8d1e7ea90bcaf3311996d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed