summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2013-07-03 15:05:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:42 -0700
commit45c64940c8bb64a042464ecec89d95eb4cce9b07 (patch)
treec5aacb1cbea7d2b7667a2afad04ef558b531d0b8 /kernel
parent7ec75e1ca1bd35872a5c7b33da4b05395bc74364 (diff)
downloadop-kernel-dev-45c64940c8bb64a042464ecec89d95eb4cce9b07.zip
op-kernel-dev-45c64940c8bb64a042464ecec89d95eb4cce9b07.tar.gz
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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sys.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index c1da757..7bf50dc 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);
OpenPOWER on IntegriCloud