[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180618150114.849216-1-arnd@arndb.de>
Date: Mon, 18 Jun 2018 17:00:38 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Andrew Morton <akpm@...ux-foundation.org>,
Thomas Gleixner <tglx@...utronix.de>
Cc: y2038@...ts.linaro.org, Arnd Bergmann <arnd@...db.de>,
Dominik Brodowski <linux@...inikbrodowski.net>,
Cyrill Gorcunov <gorcunov@...nvz.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH] 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@...db.de>
---
kernel/sys.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index ccaeffa2171b..24f838da8ca1 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2574,11 +2574,11 @@ static int do_sysinfo(struct sysinfo *info)
{
unsigned long mem_total, sav_total;
unsigned int mem_unit, bitcount;
- struct timespec tp;
+ struct timespec64 tp;
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);
get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
--
2.9.0
Powered by blists - more mailing lists