diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-18 19:06:38 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-18 19:06:38 -0500 |
| commit | 6431b430973c1c6eb2597da1533764cb4f696526 (patch) | |
| tree | a7eb955ea8dca07ba8cb97ea1f6b1e63df304b9e /arch/x86/include | |
| parent | 077a671d7bac2fd792eb04136d4fc08fd962a55e (diff) | |
| parent | 144b44b1355df48eac7fee4c7519f4be0aafa4a3 (diff) | |
Merge branch 'pm-tools'
* pm-tools:
tools / power turbostat: Support Silvermont
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index bb0465090ae5..940ed3fd889a 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h | |||
| @@ -147,6 +147,8 @@ | |||
| 147 | #define MSR_PP1_ENERGY_STATUS 0x00000641 | 147 | #define MSR_PP1_ENERGY_STATUS 0x00000641 |
| 148 | #define MSR_PP1_POLICY 0x00000642 | 148 | #define MSR_PP1_POLICY 0x00000642 |
| 149 | 149 | ||
| 150 | #define MSR_CORE_C1_RES 0x00000660 | ||
| 151 | |||
| 150 | #define MSR_AMD64_MC0_MASK 0xc0010044 | 152 | #define MSR_AMD64_MC0_MASK 0xc0010044 |
| 151 | 153 | ||
| 152 | #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) | 154 | #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) |