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

Commit bdf228a2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

fs/proc/uptime.c: use ktime_get_boottime_ts64 

get_monotonic_boottime() is deprecated and uses the old timespec type.
Let's convert /proc/uptime to use ktime_get_boottime_ts64().

Link: http://lkml.kernel.org/r/20180620081746.282742-1-arnd@arndb.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2d6e4e82

fs/proc/uptime.c

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


static int uptime_proc_show(struct seq_file *m, void *v)

{

	struct timespec uptime;

	struct timespec64 uptime;

	struct timespec64 idle;

	u64 nsec;

	u32 rem;
@@ -19,7 +19,7 @@ static int uptime_proc_show(struct seq_file *m, void *v) 
	for_each_possible_cpu(i)

		nsec += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE];



	get_monotonic_boottime(&uptime);

	ktime_get_boottime_ts64(&uptime);

	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);

	idle.tv_nsec = rem;

	seq_printf(m, "%lu.%02lu %lu.%02lu\n",