diff options
author | Mandeep Singh Baines <msb@chromium.org> | 2011-05-23 01:10:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-23 05:58:58 -0400 |
commit | 824c6b7f6294101f30e141117def224a56c203e6 (patch) | |
tree | c609d4c12a1d5af1ceccb5c1c2275df2947d9e2c | |
parent | 3ac1bbcf13c56a19927df670f429eb0c3c11f8e5 (diff) |
watchdog: Fix rounding bug in get_sample_period()
In get_sample_period(), softlockup_thresh is integer divided by
5 before the multiplication by NSEC_PER_SEC. This results in
softlockup_thresh being rounded down to the nearest integer
multiple of 5.
For example, a softlockup_thresh of 4 rounds down to 0.
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1306127423-3347-1-git-send-email-msb@chromium.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 14733d4d156b..a06972d71060 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
@@ -110,7 +110,7 @@ static unsigned long get_sample_period(void) | |||
110 | * increment before the hardlockup detector generates | 110 | * increment before the hardlockup detector generates |
111 | * a warning | 111 | * a warning |
112 | */ | 112 | */ |
113 | return softlockup_thresh / 5 * NSEC_PER_SEC; | 113 | return softlockup_thresh * (NSEC_PER_SEC / 5); |
114 | } | 114 | } |
115 | 115 | ||
116 | /* Commands for resetting the watchdog */ | 116 | /* Commands for resetting the watchdog */ |