diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 21:34:09 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 16:16:51 +0300 |
| commit | 1164dd0099c0d79146a55319670f57ab7ad1d352 (patch) | |
| tree | b6605a9f5cc12518f65551ccf31a5b6ea3377585 /arch/x86/include/asm/mach-default/mach_traps.h | |
| parent | 7b38725318f4517af6168ccbff99060d67aba1c8 (diff) | |
| download | linux-1164dd0099c0d79146a55319670f57ab7ad1d352.tar.xz | |
x86: move mach-default/*.h files to asm/
We are getting rid of subarchitecture support - move the hook files
to asm/. (These are now stale and should be replaced with more explicit
runtime mechanisms - but the transition is simpler this way.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/mach-default/mach_traps.h')
| -rw-r--r-- | arch/x86/include/asm/mach-default/mach_traps.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_traps.h b/arch/x86/include/asm/mach-default/mach_traps.h deleted file mode 100644 index f7920601e472..000000000000 --- a/arch/x86/include/asm/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 */ |