diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-02 09:12:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-02 09:12:21 +0200 |
| commit | e98db89489f0e846348a83762450a73357d53fbc (patch) | |
| tree | 61a3900320950d9fe95b848e8051af4fc763d6be /arch/x86/events/intel | |
| parent | 39c2ca43465e0f52ebba3ee96fd03436367c1880 (diff) | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| download | linux-stable-e98db89489f0e846348a83762450a73357d53fbc.tar.gz linux-stable-e98db89489f0e846348a83762450a73357d53fbc.tar.bz2 linux-stable-e98db89489f0e846348a83762450a73357d53fbc.zip | |
Merge branch 'linus' 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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 28459f4b795a..43c966d1208e 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3580,6 +3580,11 @@ static u64 bdw_limit_period(struct perf_event *event, u64 left) return left; } +static u64 nhm_limit_period(struct perf_event *event, u64 left) +{ + return max(left, 32ULL); +} + PMU_FORMAT_ATTR(event, "config:0-7" ); PMU_FORMAT_ATTR(umask, "config:8-15" ); PMU_FORMAT_ATTR(edge, "config:18" ); @@ -4624,6 +4629,7 @@ __init int intel_pmu_init(void) x86_pmu.pebs_constraints = intel_nehalem_pebs_event_constraints; x86_pmu.enable_all = intel_pmu_nhm_enable_all; x86_pmu.extra_regs = intel_nehalem_extra_regs; + x86_pmu.limit_period = nhm_limit_period; mem_attr = nhm_mem_events_attrs; |