OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[uclinux-h8/linux.git]
/
kernel
/
watchdog.c
diff --git
a/kernel/watchdog.c
b/kernel/watchdog.c
index
70bf118
..
3174bf8
100644
(file)
--- a/
kernel/watchdog.c
+++ b/
kernel/watchdog.c
@@
-154,7
+154,7
@@
static int get_softlockup_thresh(void)
*/
static unsigned long get_timestamp(void)
{
- return
local
_clock() >> 30LL; /* 2^30 ~= 10^9 */
+ return
running
_clock() >> 30LL; /* 2^30 ~= 10^9 */
}
static void set_sample_period(void)