diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-02 10:10:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-02 10:10:07 +0300 |
| commit | 77e5517cb506c5b1e0a91bf4774cc95452659d77 (patch) | |
| tree | e057ab71829a12ded68d9d22e661f0e391b5ad6b /arch/x86/events/intel | |
| parent | a3d8c0d13bdedf84fe74259f6949b2cdffd80e55 (diff) | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| download | linux-77e5517cb506c5b1e0a91bf4774cc95452659d77.tar.xz | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/power/x86/turbostat/turbostat.c
Recent turbostat changes conflicted with a pending rename of x86 model names in tip:x86/cpu,
sort it out.
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 dce329c5725d..1fc01d1f0a9b 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3572,6 +3572,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" ); @@ -4606,6 +4611,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; |