diff options
| author | Michael Büsch <mb@bu3sch.de> | 2008-02-19 11:58:20 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2008-02-19 11:58:20 +0000 |
| commit | 27e288859cf7247dd3dfa3bea52ec48387a0daf5 (patch) | |
| tree | 37cc0f9b04b8dde366b6a92750524d188a02496a /target/linux/brcm47xx/files | |
| parent | b926d7695baa0e000103371401d0f4878a08c8cd (diff) | |
| download | upstream-27e288859cf7247dd3dfa3bea52ec48387a0daf5.tar.gz upstream-27e288859cf7247dd3dfa3bea52ec48387a0daf5.tar.bz2 upstream-27e288859cf7247dd3dfa3bea52ec48387a0daf5.zip | |
SSB: Update the watchdog fix to the patch version that will go upstream.
SVN-Revision: 10494
Diffstat (limited to 'target/linux/brcm47xx/files')
| -rw-r--r-- | target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c index 2fcf684435..2c106c9b26 100644 --- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c +++ b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c @@ -2,7 +2,7 @@ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org> * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> - * Copyright (C) 2006 Michael Buesch + * Copyright (C) 2006-2008 Michael Buesch <mb@bu3sch.de> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -38,6 +38,7 @@ #include <asm/cfe.h> #include <linux/pm.h> #include <linux/ssb/ssb.h> +#include <linux/ssb/ssb_embedded.h> #include <nvram.h> @@ -55,7 +56,8 @@ static void bcm47xx_machine_restart(char *command) */ /* Set the watchdog timer to reset immediately */ - ssb_chipco_watchdog_timer_set(&ssb.chipco, 1); + if (ssb_watchdog_timer_set(&ssb, 1)) + printk(KERN_EMERG "SSB watchdog-triggered reboot failed!\n"); while (1) cpu_relax(); } @@ -64,7 +66,8 @@ static void bcm47xx_machine_halt(void) { /* Disable interrupts and watchdog and spin forever */ local_irq_disable(); - ssb_chipco_watchdog_timer_set(&ssb.chipco, 0); + if (ssb_watchdog_timer_set(&ssb, 0)) + printk(KERN_EMERG "Failed to disable SSB watchdog!\n"); while (1) cpu_relax(); } |