diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /arch/x86/include/asm/mach_traps.h | |
parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) | |
download | kernel_samsung_aries-53582c4c508a95ece9f7c907edef9911c7eb79eb.zip kernel_samsung_aries-53582c4c508a95ece9f7c907edef9911c7eb79eb.tar.gz kernel_samsung_aries-53582c4c508a95ece9f7c907edef9911c7eb79eb.tar.bz2 |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/x86/include/asm/mach_traps.h')
-rw-r--r-- | arch/x86/include/asm/mach_traps.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mach_traps.h b/arch/x86/include/asm/mach_traps.h index f792060..72a8b52 100644 --- a/arch/x86/include/asm/mach_traps.h +++ b/arch/x86/include/asm/mach_traps.h @@ -7,9 +7,19 @@ #include <asm/mc146818rtc.h> +#define NMI_REASON_PORT 0x61 + +#define NMI_REASON_SERR 0x80 +#define NMI_REASON_IOCHK 0x40 +#define NMI_REASON_MASK (NMI_REASON_SERR | NMI_REASON_IOCHK) + +#define NMI_REASON_CLEAR_SERR 0x04 +#define NMI_REASON_CLEAR_IOCHK 0x08 +#define NMI_REASON_CLEAR_MASK 0x0f + static inline unsigned char get_nmi_reason(void) { - return inb(0x61); + return inb(NMI_REASON_PORT); } static inline void reassert_nmi(void) |