Merge tag 'for-linus-20190726-2' of git://git.kernel.dk/linux-block

[linux.git] / fs / proc / uptime.c

diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 3f723cb478af31c721ec263b4db9fb3e9ac17054..a4c2791ab70baf8c5124a5e00d0e4a374652d13f 100644 (file)
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -9,7 +9,7 @@
 
 static int uptime_proc_show(struct seq_file *m, void *v)
 {
-       struct timespec uptime;
+       struct timespec64 uptime;
        struct timespec64 idle;
        u64 nsec;
        u32 rem;
@@ -19,7 +19,7 @@ static int uptime_proc_show(struct seq_file *m, void *v)
        for_each_possible_cpu(i)
                nsec += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE];
 
-       get_monotonic_boottime(&uptime);
+       ktime_get_boottime_ts64(&uptime);
        idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
        idle.tv_nsec = rem;
        seq_printf(m, "%lu.%02lu %lu.%02lu\n",