projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
81dabb4
)
fs/proc/uptime.c:uptime_proc_show(): use get_monotonic_boottime()
author
Oleg Nesterov
<
[email protected]
>
Wed, 3 Jul 2013 22:08:27 +0000
(15:08 -0700)
committer
Linus Torvalds
<
[email protected]
>
Wed, 3 Jul 2013 23:08:02 +0000
(16:08 -0700)
Change uptime_proc_show() to use get_monotonic_boottime() instead of
do_posix_clock_monotonic_gettime() + monotonic_to_bootbased().
Signed-off-by: Oleg Nesterov <
[email protected]
>
Cc: "Eric W. Biederman" <
[email protected]
>
Acked-by: John Stultz <
[email protected]
>
Cc: Tomas Janousek <
[email protected]
>
Cc: Tomas Smetana <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
fs/proc/uptime.c
patch
|
blob
|
history
diff --git
a/fs/proc/uptime.c
b/fs/proc/uptime.c
index 9610ac772d7e8e79a197725fbed6f77ef5b1dc96..061894625903ded399f2ab9285daa5f69adba854 100644
(file)
--- a/
fs/proc/uptime.c
+++ b/
fs/proc/uptime.c
@@
-20,8
+20,7
@@
static int uptime_proc_show(struct seq_file *m, void *v)
for_each_possible_cpu(i)
idletime += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE];
- do_posix_clock_monotonic_gettime(&uptime);
- monotonic_to_bootbased(&uptime);
+ get_monotonic_boottime(&uptime);
nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
idle.tv_nsec = rem;