diff options
| author | Stephane Eranian <eranian@google.com> | 2019-05-13 17:34:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-15 11:54:52 +0200 |
| commit | 8340e783e7859ccda4d3af551e92b335f3d4c127 (patch) | |
| tree | 2f6d8058c5506e1645b2526ba1f8fe288de2266b /drivers | |
| parent | 8bdd87933ee8ad99a8d53bc4629d2ef1e3ed8f82 (diff) | |
| download | linux-stable-8340e783e7859ccda4d3af551e92b335f3d4c127.tar.gz linux-stable-8340e783e7859ccda4d3af551e92b335f3d4c127.tar.bz2 linux-stable-8340e783e7859ccda4d3af551e92b335f3d4c127.zip | |
perf/x86/intel: Allow PEBS multi-entry in watermark mode
[ Upstream commit c7a286577d7592720c2f179aadfb325a1ff48c95 ]
This patch fixes a restriction/bug introduced by:
583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS")
The original patch prevented using multi-entry PEBS when wakeup_events != 0.
However given that wakeup_events is part of a union with wakeup_watermark, it
means that in watermark mode, PEBS multi-entry is also disabled which is not the
intent. This patch fixes this by checking is watermark mode is enabled.
Signed-off-by: Stephane Eranian <eranian@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: jolsa@redhat.com
Cc: kan.liang@intel.com
Cc: vincent.weaver@maine.edu
Fixes: 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS")
Link: http://lkml.kernel.org/r/20190514003400.224340-1-eranian@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions