Commit dc1b7b6c authored Jun 18, 2018 by Arnd Bergmann Committed by Thomas Gleixner Jun 19, 2018

sysinfo: Remove get_monotonic_boottime()



get_monotonic_boottime() is deprecated because it uses the old 'timespec'
structure. This replaces one of the last callers with a call to
ktime_get_boottime.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: y2038@lists.linaro.org
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Link: https://lkml.kernel.org/r/20180618150114.849216-1-arnd@arndb.de

parent 58a10456

kernel/sys.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2512,11 +2512,11 @@ static int do_sysinfo(struct sysinfo *info)
	{		{
	unsigned long mem_total, sav_total;		unsigned long mem_total, sav_total;
	unsigned int mem_unit, bitcount;		unsigned int mem_unit, bitcount;
	struct timespec tp;		struct timespec64 tp;

	memset(info, 0, sizeof(struct sysinfo));		memset(info, 0, sizeof(struct sysinfo));

	get_monotonic_boottime(&tp);		ktime_get_boottime_ts64(&tp);
	info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);		info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);

	get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);		get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);

Admin message