diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-16 12:14:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-16 12:14:46 +0200 |
| commit | cc8670945d43f857dcb99c61ea3beaacfb6ed472 (patch) | |
| tree | 9f75c5df1c2d46e2a48c06f9939cc5548715121e /arch/x86/events/intel | |
| parent | 496156e3647f44e2aab3e64f86b63294afca458a (diff) | |
| parent | 9d5dcc93a6ddfc78124f006ccd3637ce070ef2fc (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel')
| -rw-r--r-- | arch/x86/events/intel/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 1403c05e25e2..1bb59c4c59f2 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3134,7 +3134,7 @@ static unsigned long intel_pmu_large_pebs_flags(struct perf_event *event) flags &= ~PERF_SAMPLE_TIME; if (!event->attr.exclude_kernel) flags &= ~PERF_SAMPLE_REGS_USER; - if (event->attr.sample_regs_user & ~PEBS_REGS) + if (event->attr.sample_regs_user & ~PEBS_GP_REGS) flags &= ~(PERF_SAMPLE_REGS_USER | PERF_SAMPLE_REGS_INTR); return flags; } |