Merge branch 'tip/perf/urgent'

[linux-2.6-block.git] / arch / x86 / include / asm / msr-index.h

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 1d51e1850ed03d46e84c71de0c451067d0baac5b..737a52b89e64c11b22a7b902f308ee155eb6be33 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -237,6 +237,11 @@
 #define LBR_INFO_CYCLES                        0xffff
 #define LBR_INFO_BR_TYPE_OFFSET                56
 #define LBR_INFO_BR_TYPE               (0xfull << LBR_INFO_BR_TYPE_OFFSET)
+#define LBR_INFO_BR_CNTR_OFFSET                32
+#define LBR_INFO_BR_CNTR_NUM           4
+#define LBR_INFO_BR_CNTR_BITS          2
+#define LBR_INFO_BR_CNTR_MASK          GENMASK_ULL(LBR_INFO_BR_CNTR_BITS - 1, 0)
+#define LBR_INFO_BR_CNTR_FULL_MASK     GENMASK_ULL(LBR_INFO_BR_CNTR_NUM * LBR_INFO_BR_CNTR_BITS - 1, 0)
 
 #define MSR_ARCH_LBR_CTL               0x000014ce
 #define ARCH_LBR_CTL_LBREN             BIT(0)