X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=a8bc4d94e06dbbe32bd4bf4e1370c5270445214a;hp=1d7bca7f4f527c2f25b741da9fc914980a0c43bb;hb=b9bae75805932048d0b5172cd63f83b28668eb02;hpb=c28800a9c3caaf387d85ac665a25ebe99e480295

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 1d7bca7f4f52..a8bc4d94e06d 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -113,7 +113,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
@@ -121,7 +121,7 @@ static unsigned long get_sample_period(void)
 	 * 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 */