Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e32ede19 authored Mar 19, 2008 by Glauber de Oliveira Costa Committed by Ingo Molnar Apr 17, 2008

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>

parent 3cf19f31

arch/x86/kernel/nmi_64.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/kernel/traps_64.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

include/asm-x86/nmi_64.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;