summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-03-01 13:07:25 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-03-01 13:07:25 +1100
commitceff63e6553d2610795e84af866dd32621a0bc9d (patch)
treeb5a994ee2334f2b74a372bd0537db192d5843aa8 /arch
parent4c29088797dcc8405e0bdb5e601438509aa7ca2f (diff)
parent15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712 (diff)
Merge remote-tracking branch 'idle-test/idle-test'
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/msr-index.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 4d0dfa0d998e..43a18c77676d 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -36,6 +36,11 @@
#define MSR_IA32_PERFCTR1 0x000000c2
#define MSR_FSB_FREQ 0x000000cd
+#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2
+#define NHM_C3_AUTO_DEMOTE (1UL << 25)
+#define NHM_C1_AUTO_DEMOTE (1UL << 26)
+#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25)
+
#define MSR_MTRRcap 0x000000fe
#define MSR_IA32_BBL_CR_CTL 0x00000119