diff options
| author | Stephane Eranian <[email protected]> | 2019-05-14 00:34:00 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2019-05-14 07:07:58 +0000 |
| commit | c7a286577d7592720c2f179aadfb325a1ff48c95 (patch) | |
| tree | 95f4c716accffb5b8bccc81a2bf08e79375bc9c7 /drivers/fpga/fpga-bridge.c | |
| parent | perf/x86/intel: Fix INTEL_FLAGS_EVENT_CONSTRAINT* masking (diff) | |
| download | kernel-c7a286577d7592720c2f179aadfb325a1ff48c95.tar.gz kernel-c7a286577d7592720c2f179aadfb325a1ff48c95.zip | |
perf/x86/intel: Allow PEBS multi-entry in watermark mode
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 <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Fixes: 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/fpga/fpga-bridge.c')
0 files changed, 0 insertions, 0 deletions