git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
include
/
asm-i386
/
mach-default
/
mach_traps.h
diff --git
a/include/asm-i386/mach-default/mach_traps.h
b/include/asm-i386/mach-default/mach_traps.h
index
625438b
..
4e34a91
100644
(file)
--- a/
include/asm-i386/mach-default/mach_traps.h
+++ b/
include/asm-i386/mach-default/mach_traps.h
@@
-15,6
+15,18
@@
static inline void clear_mem_error(unsigned char reason)
outb(reason, 0x61);
}
outb(reason, 0x61);
}
+static inline void clear_io_check_error(unsigned char reason)
+{
+ unsigned long i;
+
+ reason = (reason & 0xf) | 8;
+ outb(reason, 0x61);
+ i = 2000;
+ while (--i) udelay(1000);
+ reason &= ~8;
+ outb(reason, 0x61);
+}
+
static inline unsigned char get_nmi_reason(void)
{
return inb(0x61);
static inline unsigned char get_nmi_reason(void)
{
return inb(0x61);