patch-2.4.25 linux-2.4.25/arch/ppc/kernel/m8xx_setup.c

Next file: linux-2.4.25/arch/ppc/kernel/m8xx_wdt.c
Previous file: linux-2.4.25/arch/ppc/kernel/idle_6xx.S
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/arch/ppc/kernel/m8xx_setup.c linux-2.4.25/arch/ppc/kernel/m8xx_setup.c
@@ -58,6 +58,7 @@
 
 extern unsigned long find_available_memory(void);
 extern void m8xx_cpm_reset(uint);
+extern void m8xx_wdt_handler_install(bd_t *bp);
 
 void __init
 m8xx_setup_arch(void)
@@ -184,6 +185,13 @@
 	if (request_irq(DEC_INTERRUPT, timebase_interrupt, 0, "tbint",
 				NULL) != 0)
 		panic("Could not allocate timer IRQ!");
+
+#ifdef CONFIG_8xx_WDT
+	/* Install watchdog timer handler early because it might be
+	 * already enabled by the bootloader
+	 */
+	m8xx_wdt_handler_install(binfo);
+#endif
 }
 
 /* The RTC on the MPC8xx is an internal register.

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)