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 <[EMAIL PROTECTED]> --- fs/proc/proc_misc.c | 1 + kernel/timer.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 0782d34..d84956c 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -107,6 +107,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, diff --git a/kernel/timer.c b/kernel/timer.c index d5e1d6f..3a8ba7d 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1106,6 +1106,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++; -- 1.5.1.4 -- TJ. (Brno, CZ), BaseOS, Red Hat - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/