Merge /spare/repo/linux-2.6/

1 files changed, 19 insertions, 0 deletions

diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 9e6ae5696650..d87423d1003a 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -904,6 +904,25 @@ void SPEFloatingPointException(struct pt_regs *regs)
 }
 #endif
 
+#ifdef CONFIG_BOOKE_WDT
+/*
+ * Default handler for a Watchdog exception,
+ * spins until a reboot occurs
+ */
+void __attribute__ ((weak)) WatchdogHandler(struct pt_regs *regs)
+{
+        /* Generic WatchdogHandler, implement your own */
+        mtspr(SPRN_TCR, mfspr(SPRN_TCR)&(~TCR_WIE));
+        return;
+}
+
+void WatchdogException(struct pt_regs *regs)
+{
+        printk (KERN_EMERG "PowerPC Book-E Watchdog Exception\n");
+        WatchdogHandler(regs);
+}
+#endif
+
 void __init trap_init(void)
 {
 }