x86, um: ... and asm-x86 move

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 0 insertions, 33 deletions

diff --git a/include/asm-x86/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h
deleted file mode 100644
index ff8778f26b84..000000000000
--- a/include/asm-x86/mach-default/mach_traps.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Machine specific NMI handling for generic.
- *  Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
- */
-#ifndef ASM_X86__MACH_DEFAULT__MACH_TRAPS_H
-#define ASM_X86__MACH_DEFAULT__MACH_TRAPS_H
-
-#include <asm/mc146818rtc.h>
-
-static inline unsigned char get_nmi_reason(void)
-{
-        return inb(0x61);
-}
-
-static inline void reassert_nmi(void)
-{
-        int old_reg = -1;
-
-        if (do_i_have_lock_cmos())
-                old_reg = current_lock_cmos_reg();
-        else
-                lock_cmos(0); /* register doesn't matter here */
-        outb(0x8f, 0x70);
-        inb(0x71);              /* dummy */
-        outb(0x0f, 0x70);
-        inb(0x71);              /* dummy */
-        if (old_reg >= 0)
-                outb(old_reg, 0x70);
-        else
-                unlock_cmos();
-}
-
-#endif /* ASM_X86__MACH_DEFAULT__MACH_TRAPS_H */