ia64/xen-unstable

view patches/linux-2.6.16.29/i386-mach-io-check-nmi.patch @ 12273:b223ba940ed1

PV-on-HVM: Fix PV-on-HVM drivers need maddr.h included for defn of maddr_t.
Signed-off-by: Takanori Kasai <Kasai.Takanori@jp.fujitsu.com>
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
author kfraser@localhost.localdomain
date Tue Nov 07 09:29:53 2006 +0000 (2006-11-07)
parents 041be3f6b38e
children
line source
1 diff -pruN ../orig-linux-2.6.16.29/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
2 --- ../orig-linux-2.6.16.29/arch/i386/kernel/traps.c 2006-09-12 19:02:10.000000000 +0100
3 +++ ./arch/i386/kernel/traps.c 2006-09-19 13:59:06.000000000 +0100
4 @@ -567,18 +567,11 @@ static void mem_parity_error(unsigned ch
6 static void io_check_error(unsigned char reason, struct pt_regs * regs)
7 {
8 - unsigned long i;
9 -
10 printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n");
11 show_registers(regs);
13 /* Re-enable the IOCK line, wait for a few seconds */
14 - reason = (reason & 0xf) | 8;
15 - outb(reason, 0x61);
16 - i = 2000;
17 - while (--i) udelay(1000);
18 - reason &= ~8;
19 - outb(reason, 0x61);
20 + clear_io_check_error(reason);
21 }
23 static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
24 diff -pruN ../orig-linux-2.6.16.29/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
25 --- ../orig-linux-2.6.16.29/include/asm-i386/mach-default/mach_traps.h 2006-09-12 19:02:10.000000000 +0100
26 +++ ./include/asm-i386/mach-default/mach_traps.h 2006-09-19 13:59:06.000000000 +0100
27 @@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig
28 outb(reason, 0x61);
29 }
31 +static inline void clear_io_check_error(unsigned char reason)
32 +{
33 + unsigned long i;
34 +
35 + reason = (reason & 0xf) | 8;
36 + outb(reason, 0x61);
37 + i = 2000;
38 + while (--i) udelay(1000);
39 + reason &= ~8;
40 + outb(reason, 0x61);
41 +}
42 +
43 static inline unsigned char get_nmi_reason(void)
44 {
45 return inb(0x61);