summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTomas Janousek <tjanouse@redhat.com>2007-07-16 10:39:42 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 20:05:41 +0400
commitd62141414a55ff3f1410b27db2a95224446e77a4 (patch)
tree36c3ddbe084ba6f688744434b39f959aef6381c8 /fs
parent924b42d5a2dbe508407a0a6290d3751f826bccdd (diff)
downloadlinux-d62141414a55ff3f1410b27db2a95224446e77a4.tar.xz
Use boot based time for uptime in /proc
Commit 411187fb05cd11676b0979d9fbf3291db69dbce2 caused uptime not to increase during suspend. This may cause confusion so I restore the old behaviour by using the boot based time instead of monotonic for uptime. Signed-off-by: Tomas Janousek <tjanouse@redhat.com> Acked-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/proc_misc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 19c9cbf1c320..d24b8d46059a 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -105,6 +105,7 @@ static int uptime_read_proc(char *page, char **start, off_t off,
cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
do_posix_clock_monotonic_gettime(&uptime);
+ monotonic_to_bootbased(&uptime);
cputime_to_timespec(idletime, &idle);
len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,