Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[linux-block.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 69b9a37ecf0d51b8878cb3a4e13ade74d36dab7d..cf5c67533ff1e1c02e296ed34d19501dd5f794dd 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2507,11 +2507,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);