Messages in this thread Patch in this message | | | Subject | [patch 036/198] ppc32: Fix mpc8xx watchdog | From | akpm@osdl ... | Date | Tue, 12 Apr 2005 03:31:07 -0700 |
| |
From: Tom Rini <trini@kernel.crashing.org>
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> ---
25-akpm/arch/ppc/syslib/m8xx_wdt.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
diff -puN arch/ppc/syslib/m8xx_wdt.c~ppc32-fix-mpc8xx-watchdog arch/ppc/syslib/m8xx_wdt.c --- 25/arch/ppc/syslib/m8xx_wdt.c~ppc32-fix-mpc8xx-watchdog 2005-04-12 03:21:12.059303608 -0700 +++ 25-akpm/arch/ppc/syslib/m8xx_wdt.c 2005-04-12 03:21:12.062303152 -0700 @@ -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_ 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); _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |