The patch titled
drivers/watchdog/shwdt.c: fix usage of mod_timer
has been added to the -mm tree. Its filename is
drivers-watchdog-shwdtc-fix-usage-of-mod_timer.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/watchdog/shwdt.c: fix usage of mod_timer
From: David Engraf <david.eng...@sysgo.com>
Fix the usage of mod_timer() and make the driver usable. mod_timer() must
be called with an absolute timeout in jiffies. The old implementation
used a relative timeout thus the hardware watchdog was never triggered.
Signed-off-by: David Engraf <david.eng...@sysgo.com>
Cc: Wim Van Sebroeck <w...@iguana.be>
Cc: Paul Mundt <let...@linux-sh.org>
Cc: <sta...@kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---
drivers/watchdog/shwdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN
drivers/watchdog/shwdt.c~drivers-watchdog-shwdtc-fix-usage-of-mod_timer
drivers/watchdog/shwdt.c
--- a/drivers/watchdog/shwdt.c~drivers-watchdog-shwdtc-fix-usage-of-mod_timer
+++ a/drivers/watchdog/shwdt.c
@@ -64,7 +64,7 @@
* misses its deadline, the kernel timer will allow the WDT to overflow.
*/
static int clock_division_ratio = WTCSR_CKS_4096;
-#define next_ping_period(cks) msecs_to_jiffies(cks - 4)
+#define next_ping_period(cks) (jiffies + msecs_to_jiffies(cks - 4))
static const struct watchdog_info sh_wdt_info;
static struct platform_device *sh_wdt_dev;
_
Patches currently in -mm which might be from david.eng...@sysgo.com are
drivers-watchdog-shwdtc-fix-usage-of-mod_timer.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
