lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: wipe get_nmi_reason out of nmi_64.h

Browse Source 
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:
Glauber de Oliveira Costa
2008-03-19 14:25:35 -03:00
committed by Ingo Molnar
parent 3cf19f31d9
commit e32ede19ac
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/nmi_64.c
View File

@@ -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;

2
arch/x86/kernel/traps_64.c
View File

@@ -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

2
include/asm-x86/nmi_64.h
View File

@@ -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;