diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-23 14:12:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-23 14:12:10 +0200 |
| commit | 65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch) | |
| tree | 02b22c99008630010f28f45f502f55915f1014c2 /arch/x86/events/intel | |
| parent | Merge tag 'perf-core-for-mingo-20160415' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation (diff) | |
| download | linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.xz linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel')
| -rw-r--r-- | arch/x86/events/intel/core.c | 1 | ||||
| -rw-r--r-- | arch/x86/events/intel/rapl.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 68fa55b4d42e..aff79884e17d 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3639,6 +3639,7 @@ __init int intel_pmu_init(void) case 78: /* 14nm Skylake Mobile */ case 94: /* 14nm Skylake Desktop */ + case 85: /* 14nm Skylake Server */ x86_pmu.late_ack = true; memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids)); memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index e657de1923c2..c9b7489ae8ee 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -744,6 +744,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { X86_RAPL_MODEL_MATCH(79, hsx_rapl_init), /* Broadwell-Server */ X86_RAPL_MODEL_MATCH(60, hsw_rapl_init), /* Haswell */ X86_RAPL_MODEL_MATCH(69, hsw_rapl_init), /* Haswell-Celeron */ + X86_RAPL_MODEL_MATCH(70, hsw_rapl_init), /* Haswell GT3e */ X86_RAPL_MODEL_MATCH(61, hsw_rapl_init), /* Broadwell */ X86_RAPL_MODEL_MATCH(71, hsw_rapl_init), /* Broadwell-H */ X86_RAPL_MODEL_MATCH(45, snbep_rapl_init), /* Sandy Bridge-EP */ |