From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 27 Jun 2013 23:52:43 +0000 (+1000)
Subject: kernel/sys.c:do_sysinfo(): use get_monotonic_boottime()
X-Git-Tag: next-20130628~3^2~328
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6bcc12345c9ffc0c5cd066789d6f11043cdd317;p=karo-tx-linux.git

kernel/sys.c:do_sysinfo(): use get_monotonic_boottime()

Change do_sysinfo() to use get_monotonic_boottime() instead of
do_posix_clock_monotonic_gettime() + monotonic_to_bootbased().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Cc: Tomas Janousek <tjanouse@redhat.com>
Cc: Tomas Smetana <tsmetana@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/kernel/sys.c b/kernel/sys.c
index c1da757a97b0..7bf50dcc6d53 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2355,8 +2355,7 @@ static int do_sysinfo(struct sysinfo *info)
 
 	memset(info, 0, sizeof(struct sysinfo));
 
-	ktime_get_ts(&tp);
-	monotonic_to_bootbased(&tp);
+	get_monotonic_boottime(&tp);
 	info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
 
 	get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);