source: trunk/packages/xen-3.1/xen-3.1/patches/linux-2.6.18/i386-mach-io-check-nmi.patch @ 34

Last change on this file since 34 was 34, checked in by hartmans, 18 years ago

Add xen and xen-common

  • Property svn:mime-type set to text/x-patch
File size: 1.4 KB
  • arch/i386/kernel/traps.c

    diff -pruN ../orig-linux-2.6.18/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
    old new static void mem_parity_error(unsigned ch 
    642642
    643643static void io_check_error(unsigned char reason, struct pt_regs * regs)
    644644{
    645         unsigned long i;
    646 
    647645        printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n");
    648646        show_registers(regs);
    649647
    650648        /* Re-enable the IOCK line, wait for a few seconds */
    651         reason = (reason & 0xf) | 8;
    652         outb(reason, 0x61);
    653         i = 2000;
    654         while (--i) udelay(1000);
    655         reason &= ~8;
    656         outb(reason, 0x61);
     649        clear_io_check_error(reason);
    657650}
    658651
    659652static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
  • include/asm-i386/mach-default/mach_traps.h

    diff -pruN ../orig-linux-2.6.18/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
    old new static inline void clear_mem_error(unsig 
    1515        outb(reason, 0x61);
    1616}
    1717
     18static inline void clear_io_check_error(unsigned char reason)
     19{
     20        unsigned long i;
     21
     22        reason = (reason & 0xf) | 8;
     23        outb(reason, 0x61);
     24        i = 2000;
     25        while (--i) udelay(1000);
     26        reason &= ~8;
     27        outb(reason, 0x61);
     28}
     29
    1830static inline unsigned char get_nmi_reason(void)
    1931{
    2032        return inb(0x61);
Note: See TracBrowser for help on using the repository browser.