From bd8ebc59f460dcd2c480d7a6a89b549589dc504e Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Sun, 22 May 2011 22:10:20 -0700
Subject: [PATCH] --- yaml --- r: 248593 b: refs/heads/master c:
 824c6b7f6294101f30e141117def224a56c203e6 h: refs/heads/master i:   248591:
 c390b4e568756eb99d378a9a6300f1c9ba5c6037 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff2880e9e7b4..bf4f787eb495 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac1bbcf13c56a19927df670f429eb0c3c11f8e5
+refs/heads/master: 824c6b7f6294101f30e141117def224a56c203e6
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index 14733d4d156b..a06972d71060 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/kernel/watchdog.c
@@ -110,7 +110,7 @@ static unsigned long get_sample_period(void)
 	 * increment before the hardlockup detector generates
 	 * a warning
 	 */
-	return softlockup_thresh / 5 * NSEC_PER_SEC;
+	return softlockup_thresh * (NSEC_PER_SEC / 5);
 }
 
 /* Commands for resetting the watchdog */