linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-x86_64 / nmi.h

diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h
index efb45c8..d3abfc6 100644 (file)
--- a/include/asm-x86_64/nmi.h
+++ b/include/asm-x86_64/nmi.h
@@ -5,27 +5,26 @@
 #define ASM_NMI_H
 
 #include <linux/pm.h>
-#include <asm/io.h>
  
 struct pt_regs;
-
+ 
 typedef int (*nmi_callback_t)(struct pt_regs * regs, int cpu);
-
-/**
+ 
+/** 
  * set_nmi_callback
  *
  * Set a handler for an NMI. Only one handler may be
  * set. Return 1 if the NMI was handled.
  */
 void set_nmi_callback(nmi_callback_t callback);
-
-/**
+ 
+/** 
  * unset_nmi_callback
  *
  * Remove the handler previously set.
  */
 void unset_nmi_callback(void);
-
+ 
 #ifdef CONFIG_PM
  
 /** Replace the PM callback routine for NMI. */
@@ -57,21 +56,4 @@ extern int unknown_nmi_panic;
 
 extern int check_nmi_watchdog(void);
  
-extern void setup_apic_nmi_watchdog (void);
-extern int reserve_lapic_nmi(void);
-extern void release_lapic_nmi(void);
-extern void disable_timer_nmi_watchdog(void);
-extern void enable_timer_nmi_watchdog(void);
-extern void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
-
-extern void nmi_watchdog_default(void);
-extern int setup_nmi_watchdog(char *);
-
-extern unsigned int nmi_watchdog;
-#define NMI_DEFAULT    -1
-#define NMI_NONE       0
-#define NMI_IO_APIC    1
-#define NMI_LOCAL_APIC 2
-#define NMI_INVALID    3
-
 #endif /* ASM_NMI_H */