From: Ingo Molnar Fix TRACE_IRQS_ON build breakage. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton --- include/asm-x86_64/irqflags.h | 7 +++++++ 1 file changed, 7 insertions(+) diff -puN include/asm-x86_64/irqflags.h~lockdep-irqtrace-subsystem-x86_64-support-fix-2 include/asm-x86_64/irqflags.h --- a/include/asm-x86_64/irqflags.h~lockdep-irqtrace-subsystem-x86_64-support-fix-2 +++ a/include/asm-x86_64/irqflags.h @@ -10,6 +10,8 @@ #ifndef _ASM_IRQFLAGS_H #define _ASM_IRQFLAGS_H +#ifndef __ASSEMBLY__ + /* interrupt control.. */ #define raw_local_save_flags(x) do { warn_if_not_ulong(x); __asm__ __volatile__("# save_flags \n\t pushfq ; popq %q0":"=g" (x): /* no input */ :"memory"); } while (0) #define raw_local_irq_restore(x) __asm__ __volatile__("# restore_flags \n\t pushq %0 ; popfq": /* no output */ :"g" (x):"memory", "cc") @@ -51,4 +53,9 @@ /* used when interrupts are already enabled or to shutdown the processor */ #define halt() __asm__ __volatile__("hlt": : :"memory") +#else /* __ASSEMBLY__: */ +# define TRACE_IRQS_ON +# define TRACE_IRQS_OFF +#endif + #endif _