projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 924b42d) | patch
Use boot based time for uptime in /proc
authorTomas Janousek <tjanouse@redhat.com>
Mon, 16 Jul 2007 06:39:42 +0000 (23:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Jul 2007 16:05:41 +0000 (09:05 -0700)
commitd62141414a55ff3f1410b27db2a95224446e77a4
tree36c3ddbe084ba6f688744434b39f959aef6381c8tree | snapshot
parent924b42d5a2dbe508407a0a6290d3751f826bccddcommit | 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>
fs/proc/proc_misc.c diff | blob | blame | history
kernel/timer.c diff | blob | blame | history
Making Linux better for my computers