tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 18fb92c3 cade8184

+3
+1
arch/x86/events/amd/iommu.c
··· 474 474 475 475 static struct perf_amd_iommu __perf_iommu = { 476 476 .pmu = { 477 + .task_ctx_nr = perf_invalid_context, 477 478 .event_init = perf_iommu_event_init, 478 479 .add = perf_iommu_add, 479 480 .del = perf_iommu_del,
+2
arch/x86/events/intel/core.c
··· 3637 3637 pr_cont("Knights Landing events, "); 3638 3638 break; 3639 3639 3640 + case 142: /* 14nm Kabylake Mobile */ 3641 + case 158: /* 14nm Kabylake Desktop */ 3640 3642 case 78: /* 14nm Skylake Mobile */ 3641 3643 case 94: /* 14nm Skylake Desktop */ 3642 3644 case 85: /* 14nm Skylake Server */