diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:47 +0100 |
| commit | 7054e4e0b165ba74562adef96a6b1c53fb9600a4 (patch) | |
| tree | 4b0a313a032f0522d277ed8d8bac63d0dc2e9a94 /arch/x86/events/core.c | |
| parent | Merge branch 'perf/urgent' into perf/core, to resolve conflicts (diff) | |
| parent | perf/cgroup: Fix child event counting bug (diff) | |
| download | wireguard-linux-7054e4e0b165ba74562adef96a6b1c53fb9600a4.tar.xz wireguard-linux-7054e4e0b165ba74562adef96a6b1c53fb9600a4.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
With the cherry-picked perf/urgent commit merged separately we can now
merge all the fixes without conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/core.c')
| -rw-r--r-- | arch/x86/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index bfc8f43909c1..4823695c459f 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2118,7 +2118,7 @@ static int x86_pmu_event_init(struct perf_event *event) } if (READ_ONCE(x86_pmu.attr_rdpmc) && - !(event->hw.flags & PERF_X86_EVENT_FREERUNNING)) + !(event->hw.flags & PERF_X86_EVENT_LARGE_PEBS)) event->hw.flags |= PERF_X86_EVENT_RDPMC_ALLOWED; return err; |