diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2005-04-16 15:24:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:23 -0700 |
| commit | fd16230a05751af5a221a1f1c988bb519fd66679 (patch) | |
| tree | dbe3fd46c4bbe02a96d97e2599733287f455cfd3 /arch/ppc | |
| parent | f50b153b1966230e78034d5ab1641ca4bb5db56d (diff) | |
| download | talos-obmc-linux-fd16230a05751af5a221a1f1c988bb519fd66679.tar.gz talos-obmc-linux-fd16230a05751af5a221a1f1c988bb519fd66679.zip | |
[PATCH] ppc32: Fix mpc8xx watchdog
The CONFIG_8xx_WDT option got broken in the generic hardirq update as ppc32
had its own different request_irq that worked when other arches used
setup_irq. This is the trivial fix for the problem.
From: Carsten Juttner <carjay@gmx.net>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/syslib/m8xx_wdt.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/ppc/syslib/m8xx_wdt.c b/arch/ppc/syslib/m8xx_wdt.c index 7838a44bfd1d..2ddc857e7fc7 100644 --- a/arch/ppc/syslib/m8xx_wdt.c +++ b/arch/ppc/syslib/m8xx_wdt.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/kernel.h> #include <linux/sched.h> #include <asm/8xx_immap.h> @@ -18,6 +19,12 @@ static int wdt_timeout; +static irqreturn_t m8xx_wdt_interrupt(int, void *, struct pt_regs *); +static struct irqaction m8xx_wdt_irqaction = { + .handler = m8xx_wdt_interrupt, + .name = "watchdog", +}; + void m8xx_wdt_reset(void) { volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR; @@ -84,8 +91,8 @@ void __init m8xx_wdt_handler_install(bd_t * binfo) imap->im_sit.sit_piscr = (mk_int_int_mask(PIT_INTERRUPT) << 8) | PISCR_PIE | PISCR_PTE; - if (request_irq(PIT_INTERRUPT, m8xx_wdt_interrupt, 0, "watchdog", NULL)) - panic("m8xx_wdt: could not allocate watchdog irq!"); + if (setup_irq(PIT_INTERRUPT, &m8xx_wdt_irqaction)) + panic("m8xx_wdt: error setting up the watchdog irq!"); printk(KERN_NOTICE "m8xx_wdt: keep-alive trigger installed (PITC: 0x%04X)\n", pitc); |
