29 lines
944 B
Diff
29 lines
944 B
Diff
|
From f1af807278f9b52c68b32e604aa4c23f1456f5d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arjan van de Ven <arjan@linux.intel.com>
|
||
|
|
Date: Wed, 4 Nov 2015 15:17:10 -0600
|
||
|
|
Subject: [PATCH 09/22] perf
|
||
|
|
|
||
|
|
Author: Arjan van de Ven <arjan@linux.intel.com>
|
||
|
|
|
||
|
|
Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
|
||
|
|
---
|
||
|
|
arch/x86/events/intel/core.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
|
||
|
|
index f0f197f4..9d1f4060 100644
|
||
|
|
--- a/arch/x86/events/intel/core.c
|
||
|
|
+++ b/arch/x86/events/intel/core.c
|
||
|
|
@@ -4028,7 +4028,7 @@ __init int intel_pmu_init(void)
|
||
|
|
*/
|
||
|
|
if (x86_pmu.extra_regs) {
|
||
|
|
for (er = x86_pmu.extra_regs; er->msr; er++) {
|
||
|
|
- er->extra_msr_access = check_msr(er->msr, 0x11UL);
|
||
|
|
+ er->extra_msr_access = false;
|
||
|
|
/* Disable LBR select mapping */
|
||
|
|
if ((er->idx == EXTRA_REG_LBR) && !er->extra_msr_access)
|
||
|
|
x86_pmu.lbr_sel_map = NULL;
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|