diff options
author | Tomas Janousek <tjanouse@redhat.com> | 2007-07-15 23:39:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:41 -0700 |
commit | d62141414a55ff3f1410b27db2a95224446e77a4 (patch) | |
tree | 36c3ddbe084ba6f688744434b39f959aef6381c8 /drivers/char/tty_io.c | |
parent | 924b42d5a2dbe508407a0a6290d3751f826bccdd (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 'drivers/char/tty_io.c')
0 files changed, 0 insertions, 0 deletions