From 1019768b30012ad05ba93e7766c677926fedf3fc Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Feb 2011 01:32:48 -0500
Subject: [PATCH] --- yaml --- r: 233759 b: refs/heads/master c:
 bfb53ccf1c734b1907df7189eef4c08489827951 h: refs/heads/master i:   233757:
 c9d860c2d1d072b0dcf0374eefcffe343a9c584e   233755:
 02a7553d1996d94033abee323644ed3c16078225   233751:
 fda8212b56e0ccddfaeb5e360ab8948511d2ef2a   233743:
 35acdded7019bd6c824d8c8f7d5643b11c188859   233727:
 2ccafe8ecc4fe15a0f4be670b9e7541f9fce6a6f v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/include/asm/msr-index.h | 1 +
 trunk/drivers/idle/intel_idle.c        | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cdf4babe64ed..218c741062b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14796fca2bd22acc73dd0887248d003b0f441d08
+refs/heads/master: bfb53ccf1c734b1907df7189eef4c08489827951
diff --git a/trunk/arch/x86/include/asm/msr-index.h b/trunk/arch/x86/include/asm/msr-index.h
index b75eeab2b1ea..43a18c77676d 100644
--- a/trunk/arch/x86/include/asm/msr-index.h
+++ b/trunk/arch/x86/include/asm/msr-index.h
@@ -39,6 +39,7 @@
 #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
diff --git a/trunk/drivers/idle/intel_idle.c b/trunk/drivers/idle/intel_idle.c
index 32b25bcaf865..4a5c4a44ffb1 100644
--- a/trunk/drivers/idle/intel_idle.c
+++ b/trunk/drivers/idle/intel_idle.c
@@ -345,8 +345,12 @@ static int intel_idle_probe(void)
 		break;
 
 	case 0x1C:	/* 28 - Atom Processor */
+		cpuidle_state_table = atom_cstates;
+		break;
+
 	case 0x26:	/* 38 - Lincroft Atom Processor */
 		cpuidle_state_table = atom_cstates;
+		auto_demotion_disable_flags = ATM_LNC_C6_AUTO_DEMOTE;
 		break;
 
 	case 0x2A:	/* SNB */