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

diff --combined arch/x86/include/asm/msr-index.h
index 9f3905697f123200eb1f7ecc749239dc5d5e1b2d,705c4082b7f1e75e84d105791a7bd00131cf5e3c..690b4027e17c994fdef4a626f270ca8b97ee041a
--- 1/arch/x86/include/asm/msr-index.h
--- 2/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@@ -35,7 -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 +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
@@@ -206,13 -205,6 +205,13 @@@
  #define MSR_GFX_PERF_LIMIT_REASONS    0x000006B0
  #define MSR_RING_PERF_LIMIT_REASONS   0x000006B1
  
 +/* Config TDP MSRs */
 +#define MSR_CONFIG_TDP_NOMINAL                0x00000648
 +#define MSR_CONFIG_TDP_LEVEL1         0x00000649
 +#define MSR_CONFIG_TDP_LEVEL2         0x0000064A
 +#define MSR_CONFIG_TDP_CONTROL                0x0000064B
 +#define MSR_TURBO_ACTIVATION_RATIO    0x0000064C
 +
  /* Hardware P state interface */
  #define MSR_PPERF                     0x0000064e
  #define MSR_PERF_LIMIT_REASONS                0x0000064f