- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / include / asm-x86 / nmi_64.h

diff --git a/include/asm-x86/nmi_64.h b/include/asm-x86/nmi_64.h
index f4c5b1e..2eeb74e 100644 (file)
--- a/include/asm-x86/nmi_64.h
+++ b/include/asm-x86/nmi_64.h
@@ -1,6 +1,3 @@
-/*
- *  linux/include/asm-i386/nmi.h
- */
 #ifndef ASM_NMI_H
 #define ASM_NMI_H
 
@@ -41,11 +38,7 @@ extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
 
 #define get_nmi_reason() inb(0x61)
 
-extern int panic_on_timeout;
 extern int unknown_nmi_panic;
-
-#ifndef CONFIG_XEN
-
 extern int nmi_watchdog_enabled;
 
 extern int check_nmi_watchdog(void);
@@ -63,7 +56,6 @@ extern void enable_timer_nmi_watchdog(void);
 extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
 
 extern void nmi_watchdog_default(void);
-extern int setup_nmi_watchdog(char *);
 
 extern atomic_t nmi_active;
 extern unsigned int nmi_watchdog;
@@ -92,9 +84,6 @@ unsigned lapic_adjust_nmi_hz(unsigned hz);
 int lapic_watchdog_ok(void);
 void disable_lapic_nmi_watchdog(void);
 void enable_lapic_nmi_watchdog(void);
-
-#endif
-
 void stop_nmi(void);
 void restart_nmi(void);