The patch titled
Subject: watchdog: using u64 in get_sample_period()
has been added to the -mm tree. Its filename is
watchdog-using-u64-in-get_sample_period.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 ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Chuansheng Liu <chuansheng.liu@xxxxxxxxx>
Subject: watchdog: using u64 in get_sample_period()
In get_sample_period(), unsigned long is not enough:
watchdog_thresh * 2 * (NSEC_PER_SEC / 5)
case1: watchdog_thresh is 10 by default,
the sample value will be: 0xEE6B 2800
case2: set watchdog_thresh is 20,
the sample value will be: 0x1 DCD6 5000
In case2, we need use u64 to express the sample period. Otherwise,
Changing the threshold thru proc often can not be successful.
Signed-off-by: liu chuansheng <chuansheng.liu@xxxxxxxxx>
Acked-by: Don Zickus <dzickus@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN kernel/watchdog.c~watchdog-using-u64-in-get_sample_period kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-using-u64-in-get_sample_period
+++ a/kernel/watchdog.c
@@ -116,7 +116,7 @@ static unsigned long get_timestamp(int t
return cpu_clock(this_cpu) >> 30LL; /* 2^30 ~= 10^9 */
}
-static unsigned long get_sample_period(void)
+static u64 get_sample_period(void)
{
/*
* convert watchdog_thresh from seconds to ns
@@ -125,7 +125,7 @@ static unsigned long get_sample_period(v
* and hard thresholds) to increment before the
* hardlockup detector generates a warning
*/
- return get_softlockup_thresh() * (NSEC_PER_SEC / 5);
+ return get_softlockup_thresh() * ((u64)NSEC_PER_SEC / 5);
}
/* Commands for resetting the watchdog */
_
Patches currently in -mm which might be from chuansheng.liu@xxxxxxxxx are
linux-next.patch
watchdog-using-u64-in-get_sample_period.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
