---

yaml --- r: 336041 b: refs/heads/master c: 8ffeb9b h: refs/heads/master i: 336039: ac2d395 v: v3
git-mirror · Nov 27, 2012 · 99c12eb · 99c12eb
1 parent ca2dbcd
commit 99c12eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eff96dd5283a102e0c1cac95247090be74a38ed
+refs/heads/master: 8ffeb9b0e6369135bf03a073514f571ef10606b9
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
@@ -116,7 +116,7 @@ static unsigned long get_timestamp(int this_cpu)
 	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(void)
 	 * 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 */