diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-31 14:39:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-31 14:39:25 -0400 |
| commit | 50f5a1ee32ba2dd8f7221e4d841249edf81b9075 (patch) | |
| tree | c5962d0c67a692793f893e69153ab0161faa862a /arch | |
| parent | dae8f283bf30738593f6d2a4623945c5e6d7794e (diff) | |
| parent | a68c7c3ff0469d79993ee85e8e0a3a9a568ce350 (diff) | |
Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull turbostat tool fixes from Len Brown:
"Just one minor kernel dependency in this batch -- added a #define to
msr-index.h"
* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: update version number to 4.7
tools/power turbostat: allow running without cpu0
tools/power turbostat: correctly decode of ENERGY_PERFORMANCE_BIAS
tools/power turbostat: enable turbostat to support Knights Landing (KNL)
tools/power turbostat: correctly display more than 2 threads/core
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index c469490db4a8..3c6bb342a48f 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h | |||
| @@ -140,6 +140,7 @@ | |||
| 140 | #define MSR_CORE_C3_RESIDENCY 0x000003fc | 140 | #define MSR_CORE_C3_RESIDENCY 0x000003fc |
| 141 | #define MSR_CORE_C6_RESIDENCY 0x000003fd | 141 | #define MSR_CORE_C6_RESIDENCY 0x000003fd |
| 142 | #define MSR_CORE_C7_RESIDENCY 0x000003fe | 142 | #define MSR_CORE_C7_RESIDENCY 0x000003fe |
| 143 | #define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff | ||
| 143 | #define MSR_PKG_C2_RESIDENCY 0x0000060d | 144 | #define MSR_PKG_C2_RESIDENCY 0x0000060d |
| 144 | #define MSR_PKG_C8_RESIDENCY 0x00000630 | 145 | #define MSR_PKG_C8_RESIDENCY 0x00000630 |
| 145 | #define MSR_PKG_C9_RESIDENCY 0x00000631 | 146 | #define MSR_PKG_C9_RESIDENCY 0x00000631 |