[PATCH] sysinfo: remove get_monotonic_boottime()

[PATCH] sysinfo: remove get_monotonic_boottime()

[Arnd Bergmann]

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>
---
 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

Re: [PATCH] sysinfo: remove get_monotonic_boottime()

[Cyrill Gorcunov]

On Mon, Jun 18, 2018 at 05:00:38PM +0200, Arnd Bergmann wrote:
> 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>
> ---
>  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);

The change is pretty obvious. Looks ok to me (though I missed
the moment when timespec became old ;)

Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>

[tip:timers/core] sysinfo: Remove get_monotonic_boottime()

[tip-bot for Arnd Bergmann]

Commit-ID:  dc1b7b6ca9d5fa905c164a667086d8a3d8605875
Gitweb:     https://git.kernel.org/tip/dc1b7b6ca9d5fa905c164a667086d8a3d8605875
Author:     Arnd Bergmann <arnd@arndb.de>
AuthorDate: Mon, 18 Jun 2018 17:00:38 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 19 Jun 2018 09:56:27 +0200

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

---
 kernel/sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sys.c b/kernel/sys.c
index 38509dc1f77b..e27b51d3facd 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2512,11 +2512,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);