Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1395783 > unrolled thread

[GIT PULL] perf fixes

Back to article view | Back to linux.kernel

Contents

  [GIT PULL] perf fixes Ingo Molnar <mingo@kernel.org> - 2016-05-06 13:30 +0200

#1395783 — [GIT PULL] perf fixes

Linus,

Please pull the latest perf-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus

   # HEAD: 8482716b9d865db34c55d4bf2fed19498e7195b9 perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs

This tree contains two fixes: new Intel CPU model numbers and an AMD/iommu uncore 
PMU driver fix.

 Thanks,

	Ingo

------------------>
Andi Kleen (1):
      perf/x86: Add model numbers for Kabylake CPUs

Peter Zijlstra (1):
      perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs


 arch/x86/events/amd/iommu.c  | 1 +
 arch/x86/events/intel/core.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 40625ca7a190..6011a573dd64 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -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,
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index aff79884e17d..a6fd4dbcf820 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -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 */

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web