x86: wipe get_nmi_reason out of nmi_64.h
use mach_traps when it is supposed to be used. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
3cf19f31d9
Коммит
e32ede19ac
|
@ -26,6 +26,8 @@
|
|||
#include <asm/proto.h>
|
||||
#include <asm/mce.h>
|
||||
|
||||
#include <mach_traps.h>
|
||||
|
||||
int unknown_nmi_panic;
|
||||
int nmi_watchdog_enabled;
|
||||
int panic_on_unrecovered_nmi;
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
#include <linux/kdebug.h>
|
||||
#include <linux/utsname.h>
|
||||
|
||||
#include <mach_traps.h>
|
||||
|
||||
#if defined(CONFIG_EDAC)
|
||||
#include <linux/edac.h>
|
||||
#endif
|
||||
|
|
|
@ -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 die_nmi(char *str, struct pt_regs *regs, int do_panic);
|
||||
|
||||
#define get_nmi_reason() inb(0x61)
|
||||
|
||||
extern int unknown_nmi_panic;
|
||||
extern int nmi_watchdog_enabled;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче