diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 11:25:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 11:25:34 -0400 |
| commit | 49899007b9401486421c99bb269db89b88136e47 (patch) | |
| tree | ce73158ca09d04749dc2685eacf86b45554bd666 /arch | |
| parent | 6fedb0ff32e6bfcc408a8d52c68b8bfe4e3d945b (diff) | |
| parent | e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull idle update from Len Brown:
"Two Intel-platform-specific updates to intel_idle, and a cosmetic
tweak to the turbostat utility"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: tweak whitespace in output format
intel_idle: Broadwell support
intel_idle: Disable Baytrail Core and Module C6 auto-demotion
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index eac9e92fe181..e21331ce368f 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h | |||
| @@ -149,6 +149,9 @@ | |||
| 149 | 149 | ||
| 150 | #define MSR_CORE_C1_RES 0x00000660 | 150 | #define MSR_CORE_C1_RES 0x00000660 |
| 151 | 151 | ||
| 152 | #define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 | ||
| 153 | #define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 | ||
| 154 | |||
| 152 | #define MSR_AMD64_MC0_MASK 0xc0010044 | 155 | #define MSR_AMD64_MC0_MASK 0xc0010044 |
| 153 | 156 | ||
| 154 | #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) | 157 | #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) |