Commit e32ede19 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar

x86: wipe get_nmi_reason out of nmi_64.h

use mach_traps when it is supposed to be used.
Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3cf19f31
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/mce.h> #include <asm/mce.h>
#include <mach_traps.h>
int unknown_nmi_panic; int unknown_nmi_panic;
int nmi_watchdog_enabled; int nmi_watchdog_enabled;
int panic_on_unrecovered_nmi; int panic_on_unrecovered_nmi;
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <linux/kdebug.h> #include <linux/kdebug.h>
#include <linux/utsname.h> #include <linux/utsname.h>
#include <mach_traps.h>
#if defined(CONFIG_EDAC) #if defined(CONFIG_EDAC)
#include <linux/edac.h> #include <linux/edac.h>
#endif #endif
......
...@@ -36,8 +36,6 @@ static inline void unset_nmi_pm_callback(struct pm_dev * dev) ...@@ -36,8 +36,6 @@ static inline void unset_nmi_pm_callback(struct pm_dev * dev)
extern void default_do_nmi(struct pt_regs *); extern void default_do_nmi(struct pt_regs *);
extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
#define get_nmi_reason() inb(0x61)
extern int unknown_nmi_panic; extern int unknown_nmi_panic;
extern int nmi_watchdog_enabled; extern int nmi_watchdog_enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment