On Mon, 2012-09-10 at 20:48 +0200, Wim Van Sebroeck wrote: > Hi Toshi, > > > kdump can be interrupted by watchdog timer when the timer is left > > activated on the crash kernel. Changed the hpwdt driver to disable > > watchdog timer at boot-time. This assures that watchdog timer is > > disabled until /dev/watchdog is opened, and prevents watchdog timer > > to be left running on the crash kernel. > > > > Signed-off-by: Toshi Kani <toshi.kani@xxxxxx> > > Tested-by: Lisa Mitchell <lisa.mitchell@xxxxxx> > > Cc: stable@xxxxxxxxxxxxxxx > > --- > > drivers/watchdog/hpwdt.c | 3 +++ > > 1 files changed, 3 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c > > index 1eff743..ae60406 100644 > > --- a/drivers/watchdog/hpwdt.c > > +++ b/drivers/watchdog/hpwdt.c > > @@ -814,6 +814,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, > > hpwdt_timer_reg = pci_mem_addr + 0x70; > > hpwdt_timer_con = pci_mem_addr + 0x72; > > > > + /* Make sure that timer is disabled until /dev/watchdog is opened */ > > + hpwdt_stop(); > > + > > /* Make sure that we have a valid soft_margin */ > > if (hpwdt_change_timer(soft_margin)) > > hpwdt_change_timer(DEFAULT_MARGIN); > > Added to linux-watchdog-next . Great! Thanks Wim! -Toshi > > Kind regards, > Wim. > -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
