aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-27 10:10:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-27 10:10:54 -0700
commitf222eba0f9d98376d363b51fcc2361fb56929844 (patch)
tree7b75784eda684b96d4235149acc68b4adbcc50a4 /include
parentcf867ac375cea7c7a834eaddaf373e2662d9e260 (diff)
parent7f424a8b08c26dc14ac5c17164014539ac9a5c65 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-idle-fix
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-idle-fix: fix idle (arch, acpi and apm) and lockdep
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/processor.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 117343b0c27..2e7974ec77e 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -722,6 +722,7 @@ static inline void __mwait(unsigned long eax, unsigned long ecx)
static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
{
+ trace_hardirqs_on();
/* "mwait %eax, %ecx;" */
asm volatile("sti; .byte 0x0f, 0x01, 0xc9;"
:: "a" (eax), "c" (ecx));