summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-16 22:57:02 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-16 22:57:02 +0100
commitd9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914 (patch)
tree6121f08535ca972d3f47ac11abdc9414744a9e08 /arch
parent8005c49d9aea74d382f474ce11afbbc7d7130bec (diff)
parent5369a21e3f26ef9d2bf6ea1b322d6899a4ed08e0 (diff)
downloadlinux-sh-d9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914.tar.gz
Merge branch 'pm-tools'
* pm-tools: x86: remove unused definition of MSR_NHM_PLATFORM_INFO tools/power turbostat: use new name for MSR_PLATFORM_INFO
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/msr-index.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 9f3905697f12..690b4027e17c 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -35,7 +35,7 @@
#define MSR_IA32_PERFCTR0 0x000000c1
#define MSR_IA32_PERFCTR1 0x000000c2
#define MSR_FSB_FREQ 0x000000cd
-#define MSR_NHM_PLATFORM_INFO 0x000000ce
+#define MSR_PLATFORM_INFO 0x000000ce
#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2
#define NHM_C3_AUTO_DEMOTE (1UL << 25)
@@ -44,7 +44,6 @@
#define SNB_C1_AUTO_UNDEMOTE (1UL << 27)
#define SNB_C3_AUTO_UNDEMOTE (1UL << 28)
-#define MSR_PLATFORM_INFO 0x000000ce
#define MSR_MTRRcap 0x000000fe
#define MSR_IA32_BBL_CR_CTL 0x00000119
#define MSR_IA32_BBL_CR_CTL3 0x0000011e