Use boot based time for uptime in /proc
Commit 411187fb05
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>
This commit is contained in:

committed by
Linus Torvalds

parent
924b42d5a2
commit
d62141414a
@@ -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,
|
||||
|
Reference in New Issue
Block a user