summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-11 15:23:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-11 15:23:17 -0700
commitac4e01093f6d7b051c5d6a3e61ea5337774ac36a (patch)
tree395a03788c81aa0c3ba5cdcb3573365d5880bdc7 /arch
parentc4cc75c3321cad6f20d1e5325293890255c8a663 (diff)
parent86239ceb33b0d8480b0f0ca0eec08e7f7a807374 (diff)
downloadlinux-ac4e01093f6d7b051c5d6a3e61ea5337774ac36a.tar.gz
linux-ac4e01093f6d7b051c5d6a3e61ea5337774ac36a.tar.bz2
linux-ac4e01093f6d7b051c5d6a3e61ea5337774ac36a.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull idle update from Len Brown: "Add support for new Haswell-ULT CPU idle power states" * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: intel_idle: initial C8, C9, C10 support tools/power turbostat: display C8, C9, C10 residency
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/uapi/asm/msr-index.h3
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 b3a4866661c5..2af848dfa754 100644
--- a/arch/x86/include/uapi/asm/msr-index.h
+++ b/arch/x86/include/uapi/asm/msr-index.h
@@ -120,6 +120,9 @@
#define MSR_CORE_C6_RESIDENCY 0x000003fd
#define MSR_CORE_C7_RESIDENCY 0x000003fe
#define MSR_PKG_C2_RESIDENCY 0x0000060d
+#define MSR_PKG_C8_RESIDENCY 0x00000630
+#define MSR_PKG_C9_RESIDENCY 0x00000631
+#define MSR_PKG_C10_RESIDENCY 0x00000632
/* Run Time Average Power Limiting (RAPL) Interface */