diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-02 16:21:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-02 16:21:25 +0200 |
| commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
| tree | ff2bcb135ebf090d7b383d55123b621f4590632c /arch/x86/include/asm/msr-index.h | |
| parent | Merge branch 'bridge_vlan_cleanups_fixes' (diff) | |
| parent | Merge tag 'mmc-v4.3-rc3' of git://git.linaro.org/people/ulf.hansson/mmc (diff) | |
| download | linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.xz linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/include/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index b98b471a3b7e..b8c14bb7fc8f 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -141,6 +141,8 @@ #define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) #define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) +#define MSR_PEBS_FRONTEND 0x000003f7 + #define MSR_IA32_POWER_CTL 0x000001fc #define MSR_IA32_MC0_CTL 0x00000400 |