git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: serial: io_edgeport: fix descriptor error handling
[pandora-kernel.git]
/
kernel
/
watchdog.c
diff --git
a/kernel/watchdog.c
b/kernel/watchdog.c
index
1d7bca7
..
a8bc4d9
100644
(file)
--- 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 */
}
return cpu_clock(this_cpu) >> 30LL; /* 2^30 ~= 10^9 */
}
-static u
nsigned long
get_sample_period(void)
+static u
64
get_sample_period(void)
{
/*
* convert watchdog_thresh from seconds to ns
{
/*
* 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
*/
* 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 */
}
/* Commands for resetting the watchdog */