Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6214141 authored by Tomas Janousek's avatar Tomas Janousek Committed by Linus Torvalds
Browse files

Use boot based time for uptime in /proc 



Commit 411187fb 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: default avatarTomas Janousek <tjanouse@redhat.com>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 924b42d5

fs/proc/proc_misc.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

kernel/timer.c

+1 −0
Original line number Diff line number Diff line
@@ -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++;