diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 11:46:30 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 11:46:30 (GMT) |
commit | bc841e260c95608921809a2c7481cf6f03bec21a (patch) | |
tree | 2c2863c2b4024ac8c9de72eaa9e032f417d5d4d1 /arch/x86/include | |
parent | e717a62d3602e41d4b0f9cd2d18e6851d33a2150 (diff) | |
parent | a0c9b8cc43e0acada4574b33a19b5178520f1218 (diff) | |
download | linux-bc841e260c95608921809a2c7481cf6f03bec21a.tar.xz |
Merge branch 'pm-cpu'
* pm-cpu:
x86: remove duplicate turbo ratio limit MSRs
tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/msr-index.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 5a73a9c..56f4c66 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -64,8 +64,6 @@ #define MSR_OFFCORE_RSP_0 0x000001a6 #define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae #define MSR_TURBO_RATIO_LIMIT 0x000001ad #define MSR_TURBO_RATIO_LIMIT1 0x000001ae #define MSR_TURBO_RATIO_LIMIT2 0x000001af |