bitkeeper revision 1.1217 (421485a7z8JARjjC9F7b0rTr-A1WOw)

Ensure watchdog disabled during fatal-error handling.
Signed-off-by: Keir Fraser <keir@xensource.com>

xen/arch/x86/traps.c

@@ -108,6 +108,8 @@ asmlinkage void fatal_trap(int trapnr, struct xen_regs *regs)
         "machine check", "simd error"
     };
 
+    watchdog_on = 0;
+
     show_registers(regs);
 
     if ( trapnr == TRAP_page_fault )

xen/drivers/char/console.c

@@ -598,6 +598,7 @@ void panic(const char *fmt, ...)
 
     debugtrace_dump();
 
+    watchdog_on = 0;
     mdelay(5000);
     machine_restart(0);
 }

xen/include/xen/lib.h

@@ -8,7 +8,6 @@
 
 #define BUG() do {					\
     printk("BUG at %s:%d\n", __FILE__, __LINE__);	\
-    debugtrace_dump();                                  \
     FORCE_CRASH();                                      \
 } while ( 0 )