(modified fix merged by akpm 30/11/06)

When i386 kernel compiled without CONFIG_X86_LOCAL_APIC, this happens:

In file included from arch/i386/kernel/traps.c:51:
include/asm/nmi.h:46:1: warning: "trigger_all_cpu_backtrace" redefined
In file included from arch/i386/kernel/traps.c:32:
include/linux/nmi.h:25:1: warning: this is the location of the previous definition
In file included from arch/i386/kernel/traps.c:51:
include/asm/nmi.h:46:1: warning: "trigger_all_cpu_backtrace" redefined
In file included from arch/i386/kernel/traps.c:32:
include/linux/nmi.h:25:1: warning: this is the location of the previous definition

This is because x86_64-mm-all-cpu-backtrace.patch makes 
trigger_all_cpu_backtrace to be defined twice in such case.

Signed-off-by: Jiri Kosina
Signed-off-by: Andrew Morton

--- 

 include/asm-i386/nmi.h   |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
diff --git a/include/asm-i386/nmi.h b/include/asm-i386/nmi.h
index 571a32c..02a3f7f 100644
--- a/include/asm-i386/nmi.h
+++ b/include/asm-i386/nmi.h
@@ -42,7 +42,9 @@ extern int proc_nmi_enabled(struct ctl_t
 			void __user *, size_t *, loff_t *);
 extern int unknown_nmi_panic;
 
+#ifdef ARCH_HAS_NMI_WATCHDOG
 void __trigger_all_cpu_backtrace(void);
 #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()
+#endif
 
 #endif /* ASM_NMI_H */