Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18fb92c3 authored May 06, 2016 by Linus Torvalds

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "This tree contains two fixes: new Intel CPU model numbers and an
  AMD/iommu uncore PMU driver fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs
  perf/x86: Add model numbers for Kabylake CPUs

parents cade8184 8482716b

arch/x86/events/amd/iommu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,7 @@ static __init int _init_perf_amd_iommu(

		static struct perf_amd_iommu __perf_iommu = {
		.pmu = {
		.task_ctx_nr = perf_invalid_context,
		.event_init = perf_iommu_event_init,
		.add = perf_iommu_add,
		.del = perf_iommu_del,

arch/x86/events/intel/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3637,6 +3637,8 @@ __init int intel_pmu_init(void)
		pr_cont("Knights Landing events, ");
		break;

		case 142: /* 14nm Kabylake Mobile */
		case 158: /* 14nm Kabylake Desktop */
		case 78: /* 14nm Skylake Mobile */
		case 94: /* 14nm Skylake Desktop */
		case 85: /* 14nm Skylake Server */