X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-x86%2Fprocessor.h;h=559105220a477e2be9cfbd87eee62d1cd68767c2;hb=13c48c490208d9e70d8d66d56f96c5054db69af7;hp=117343b0c271f7f3781d8d67e5e0370671b1e1a7;hpb=c837c93a03be711dd6e09215b74b4f23bbd1ff83;p=linux-2.6

diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 117343b0c2..559105220a 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -3,9 +3,6 @@
 
 #include <asm/processor-flags.h>
 
-/* migration helper, for KVM - will be removed in 2.6.25: */
-#define Xgt_desc_struct	desc_ptr
-
 /* Forward declaration, a strange C thing */
 struct task_struct;
 struct mm_struct;
@@ -722,6 +719,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));