ia64/xen-unstable

changeset 3849:0adffee5575c

bitkeeper revision 1.1217 (421485a7z8JARjjC9F7b0rTr-A1WOw)

Ensure watchdog disabled during fatal-error handling.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@scramble.cl.cam.ac.uk
date Thu Feb 17 11:53:11 2005 +0000 (2005-02-17)
parents 786c05f5b537
children aa7e56a968b8
files xen/arch/x86/traps.c xen/drivers/char/console.c xen/include/xen/lib.h
line diff
     1.1 --- a/xen/arch/x86/traps.c	Thu Feb 17 11:24:33 2005 +0000
     1.2 +++ b/xen/arch/x86/traps.c	Thu Feb 17 11:53:11 2005 +0000
     1.3 @@ -108,6 +108,8 @@ asmlinkage void fatal_trap(int trapnr, s
     1.4          "machine check", "simd error"
     1.5      };
     1.6  
     1.7 +    watchdog_on = 0;
     1.8 +
     1.9      show_registers(regs);
    1.10  
    1.11      if ( trapnr == TRAP_page_fault )
     2.1 --- a/xen/drivers/char/console.c	Thu Feb 17 11:24:33 2005 +0000
     2.2 +++ b/xen/drivers/char/console.c	Thu Feb 17 11:53:11 2005 +0000
     2.3 @@ -598,6 +598,7 @@ void panic(const char *fmt, ...)
     2.4  
     2.5      debugtrace_dump();
     2.6  
     2.7 +    watchdog_on = 0;
     2.8      mdelay(5000);
     2.9      machine_restart(0);
    2.10  }
     3.1 --- a/xen/include/xen/lib.h	Thu Feb 17 11:24:33 2005 +0000
     3.2 +++ b/xen/include/xen/lib.h	Thu Feb 17 11:53:11 2005 +0000
     3.3 @@ -8,7 +8,6 @@
     3.4  
     3.5  #define BUG() do {					\
     3.6      printk("BUG at %s:%d\n", __FILE__, __LINE__);	\
     3.7 -    debugtrace_dump();                                  \
     3.8      FORCE_CRASH();                                      \
     3.9  } while ( 0 )
    3.10