summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-08-22 00:54:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-22 13:52:45 -0400
commitbdf228a27278d398ad26a156f01811be405867f9 (patch)
treeadad2eb770f76249fe6092b29b4eda6ec5ef896a /fs/proc
parent2d6e4e822ad8174b59414903ae6b35660032c20a (diff)
fs/proc/uptime.c: use ktime_get_boottime_ts64
get_monotonic_boottime() is deprecated and uses the old timespec type. Let's convert /proc/uptime to use ktime_get_boottime_ts64(). Link: http://lkml.kernel.org/r/20180620081746.282742-1-arnd@arndb.de Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Deepa Dinamani <deepa.kernel@gmail.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/uptime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 3f723cb478af..a4c2791ab70b 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -9,7 +9,7 @@
9 9
10static int uptime_proc_show(struct seq_file *m, void *v) 10static int uptime_proc_show(struct seq_file *m, void *v)
11{ 11{
12 struct timespec uptime; 12 struct timespec64 uptime;
13 struct timespec64 idle; 13 struct timespec64 idle;
14 u64 nsec; 14 u64 nsec;
15 u32 rem; 15 u32 rem;
@@ -19,7 +19,7 @@ static int uptime_proc_show(struct seq_file *m, void *v)
19 for_each_possible_cpu(i) 19 for_each_possible_cpu(i)
20 nsec += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE]; 20 nsec += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE];
21 21
22 get_monotonic_boottime(&uptime); 22 ktime_get_boottime_ts64(&uptime);
23 idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem); 23 idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
24 idle.tv_nsec = rem; 24 idle.tv_nsec = rem;
25 seq_printf(m, "%lu.%02lu %lu.%02lu\n", 25 seq_printf(m, "%lu.%02lu %lu.%02lu\n",