Skip to content

Commit

Permalink
Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/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
  • Loading branch information
Linus Torvalds committed May 31, 2015
2 parents dae8f28 + a68c7c3 commit 50f5a1e
Show file tree
Hide file tree
Showing 2 changed files with 185 additions and 40 deletions.
1 change: 1 addition & 0 deletions arch/x86/include/uapi/asm/msr-index.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
#define MSR_CORE_C3_RESIDENCY 0x000003fc
#define MSR_CORE_C6_RESIDENCY 0x000003fd
#define MSR_CORE_C7_RESIDENCY 0x000003fe
#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff
#define MSR_PKG_C2_RESIDENCY 0x0000060d
#define MSR_PKG_C8_RESIDENCY 0x00000630
#define MSR_PKG_C9_RESIDENCY 0x00000631
Expand Down
Loading

0 comments on commit 50f5a1e

Please sign in to comment.