Merge branch 'cell-merge' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6

[~andy/linux] / include / asm-i386 / irqflags.h

diff --git a/include/asm-i386/irqflags.h b/include/asm-i386/irqflags.h
index 9ce01f3fb7bcb4c98171610cd06cdf45e8a23a8c..17b18cf4fe9dc6bc5fb31bca36b55c144cd954e6 100644 (file)
--- a/include/asm-i386/irqflags.h
+++ b/include/asm-i386/irqflags.h
@@ -79,8 +79,8 @@ static inline unsigned long __raw_local_irq_save(void)
 }
 
 #else
-#define DISABLE_INTERRUPTS             cli
-#define ENABLE_INTERRUPTS              sti
+#define DISABLE_INTERRUPTS(clobbers)   cli
+#define ENABLE_INTERRUPTS(clobbers)    sti
 #define ENABLE_INTERRUPTS_SYSEXIT      sti; sysexit
 #define INTERRUPT_RETURN               iret
 #define GET_CR0_INTO_EAX               movl %cr0, %eax