From: Andrew Morton powerpc: In file included from include/linux/interrupt.h:13, from arch/powerpc/sysdev/mpic.c:26: include/linux/trace_irqflags.h:55:1: warning: "local_irq_save" redefined In file included from include/asm/system.h:9, from include/linux/spinlock.h:56, from include/linux/irq.h:18, from arch/powerpc/sysdev/mpic.c:24: include/asm/hw_irq.h:81:1: warning: this is the location of the previous definition In file included from include/linux/interrupt.h:13, from arch/powerpc/sysdev/mpic.c:26: include/linux/trace_irqflags.h:58:1: warning: "local_irq_restore" redefined In file included from include/asm/system.h:9, from include/linux/spinlock.h:56, from include/linux/irq.h:18, from arch/powerpc/sysdev/mpic.c:24: include/asm/hw_irq.h:34:1: warning: this is the location of the previous definition Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton --- include/linux/trace_irqflags.h | 4 ++++ 1 files changed, 4 insertions(+) diff -puN include/linux/trace_irqflags.h~lock-validator-irqtrace-core-non-x86-fix include/linux/trace_irqflags.h --- 25/include/linux/trace_irqflags.h~lock-validator-irqtrace-core-non-x86-fix 2006-05-30 06:14:39.000000000 -0600 +++ 25-akpm/include/linux/trace_irqflags.h 2006-05-30 06:15:04.000000000 -0600 @@ -48,6 +48,7 @@ # define INIT_TRACE_IRQFLAGS #endif +#ifdef CONFIG_X86 #define local_irq_enable() \ do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0) #define local_irq_disable() \ @@ -65,7 +66,9 @@ raw_local_irq_restore(flags); \ } \ } while (0) +#endif /* CONFIG_X86 */ +#ifdef CONFIG_X86 #define safe_halt() \ do { \ trace_hardirqs_on(); \ @@ -83,5 +86,6 @@ }) #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags) +#endif /* CONFIG_X86 */ #endif _