Merge branch 'pm-tools'

* pm-tools: tools / power turbostat: Support Silvermont
ambv · Nov 19, 2013 · 6431b43 · 6431b43
2 parents 077a671 + 144b44b
commit 6431b43
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 56 deletions.
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h
@@ -147,6 +147,8 @@
 #define MSR_PP1_ENERGY_STATUS		0x00000641
 #define MSR_PP1_POLICY			0x00000642
 
+#define MSR_CORE_C1_RES			0x00000660
+
 #define MSR_AMD64_MC0_MASK		0xc0010044
 
 #define MSR_IA32_MCx_CTL(x)		(MSR_IA32_MC0_CTL + 4*(x))