summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-23 23:25:53 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-22 10:59:46 -0800
commitdb11393d79684afc15b3d3d52a1664171180c350 (patch)
tree216906f0e6ce3f63277321657f28862d29e3d753 /drivers
parent4fc910677fa95f03bd8431d21766ba9d7d967fa0 (diff)
intel_idle: do not use the LAPIC timer for ATOM C2
commit c25d29952b2a8c9aaf00e081c9162a0e383030cd upstream. If we use the LAPIC timer during ATOM C2 on some nvidia chisets, the system stalls. https://bugzilla.kernel.org/show_bug.cgi?id=21032 Signed-off-by: Len Brown <len.brown@intel.com> Cc: Tom Gundersen <teg@jklm.no> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rwxr-xr-xdrivers/idle/intel_idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 54f0fb4cd5d2..ae48da953834 100755
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -308,7 +308,7 @@ static int intel_idle_probe(void)
break;
case 0x1C: /* 28 - Atom Processor */
- lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */
+ lapic_timer_reliable_states = (1 << 1); /* C1 */
cpuidle_state_table = atom_cstates;
choose_substate = choose_zero_substate;
break;