- patches.arch/x86_mce_intel_decode_physical_address.patch:

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

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index e49bbf2..93da9c3 100644 (file)
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
@@ -5,6 +5,8 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
+#ifdef ARCH_HAS_NMI_WATCHDOG
+
 /**
  * do_nmi_callback
  *
@@ -14,11 +16,6 @@
 int do_nmi_callback(struct pt_regs *regs, int cpu);
 
 extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
-
-extern int unknown_nmi_panic;
-
-#ifdef ARCH_HAS_NMI_WATCHDOG
-
 extern int check_nmi_watchdog(void);
 extern int nmi_watchdog_enabled;
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
@@ -44,6 +41,7 @@ extern unsigned int nmi_watchdog;
 struct ctl_table;
 extern int proc_nmi_enabled(struct ctl_table *, int ,
                        void __user *, size_t *, loff_t *);
+extern int unknown_nmi_panic;
 
 void arch_trigger_all_cpu_backtrace(void);
 #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
@@ -66,6 +64,7 @@ static inline int nmi_watchdog_active(void)
         */
        return nmi_watchdog & (NMI_LOCAL_APIC | NMI_IO_APIC);
 }
+#endif
 
 void lapic_watchdog_stop(void);
 int lapic_watchdog_init(unsigned nmi_hz);
@@ -73,9 +72,6 @@ int lapic_wd_event(unsigned nmi_hz);
 unsigned lapic_adjust_nmi_hz(unsigned hz);
 void disable_lapic_nmi_watchdog(void);
 void enable_lapic_nmi_watchdog(void);
-
-#endif
-
 void stop_nmi(void);
 void restart_nmi(void);