aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-12-06 15:01:23 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2010-12-14 10:48:40 -0800
commitcc76afb3c3a2bf99f7e5f5744d1111a6db7f333d (patch)
treebf64e19b6b89d2a89285d0a435ea2d6d753749e3
parent488bda7555a1f49064bef231a77b2fa20738f0cc (diff)
downloadmrst-s0i3-test-cc76afb3c3a2bf99f7e5f5744d1111a6db7f333d.tar.gz
mrst-s0i3-test-cc76afb3c3a2bf99f7e5f5744d1111a6db7f333d.tar.xz
mrst-s0i3-test-cc76afb3c3a2bf99f7e5f5744d1111a6db7f333d.zip
s0i3: don't simulate by default
Stub out the simulated return hack.
-rw-r--r--drivers/idle/mrst_s0i3_asm.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/mrst_s0i3_asm.S b/drivers/idle/mrst_s0i3_asm.S
index 35259c4ac4a..10872fa4a3c 100644
--- a/drivers/idle/mrst_s0i3_asm.S
+++ b/drivers/idle/mrst_s0i3_asm.S
@@ -94,7 +94,7 @@ ENTRY(mrst_s0i3_entry)
/* If MWAIT wakes us up, assume something happened... */
cli
- jmp simulate_resume
+ /* jmp simulate_resume */
movl %esi, %esp
xorl %eax, %eax /* Not really S0i3 */