aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorTomas Janousek <tjanouse@redhat.com>2007-07-15 23:39:42 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 09:05:41 -0700
commitd62141414a55ff3f1410b27db2a95224446e77a4 (patch)
tree36c3ddbe084ba6f688744434b39f959aef6381c8 /kernel
parent924b42d5a2dbe508407a0a6290d3751f826bccdd (diff)
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 'kernel')
-rw-r--r--kernel/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 1a69705c2fb..1ab3106a2b5 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1114,6 +1114,7 @@ int do_sysinfo(struct sysinfo *info)
getnstimeofday(&tp);
tp.tv_sec += wall_to_monotonic.tv_sec;
tp.tv_nsec += wall_to_monotonic.tv_nsec;
+ monotonic_to_bootbased(&tp);
if (tp.tv_nsec - NSEC_PER_SEC >= 0) {
tp.tv_nsec = tp.tv_nsec - NSEC_PER_SEC;
tp.tv_sec++;