summaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-05-24 19:36:31 +0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 22:32:50 +0200
commitddca03c98a7f7ad5ab09967ff52d4ed60358c896 (patch)
treed59a5c8ece8858a1436d88a10fd12e6c6cf564b2 /include/asm-x86
parent2e4db9d2c5db9c9dd3e1d1ec3263bc4a990ff8df (diff)
downloadblackbird-op-linux-ddca03c98a7f7ad5ab09967ff52d4ed60358c896.tar.gz
blackbird-op-linux-ddca03c98a7f7ad5ab09967ff52d4ed60358c896.zip
x86: nmi - unify die_nmi() interface
By slightly changing 32bit mode die_nmi() we may unify the interface and make it common for both (32/64bit) modes Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: hpa@zytor.com Cc: mingo@redhat.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/nmi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
index 8455bf36d8df..7cd5b6a88138 100644
--- a/include/asm-x86/nmi.h
+++ b/include/asm-x86/nmi.h
@@ -38,12 +38,12 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev)
#ifdef CONFIG_X86_64
extern void default_do_nmi(struct pt_regs *);
-extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
extern void nmi_watchdog_default(void);
#else
#define nmi_watchdog_default() do {} while (0)
#endif
+extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
extern int check_nmi_watchdog(void);
extern int nmi_watchdog_enabled;
extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
OpenPOWER on IntegriCloud