diff mbox

[RFC] uptime: Convert uptime to use 64bit time accessor

Message ID 1426181057-2506-1-git-send-email-john.stultz@linaro.org
State New
Headers show

Commit Message

John Stultz March 12, 2015, 5:24 p.m. UTC 
Convert the uptime output to use the timespec64 structure.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 fs/proc/uptime.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

John Stultz March 12, 2015, 6:03 p.m. UTC | #1 
On Thu, Mar 12, 2015 at 10:42 AM, Frederic Weisbecker
<fweisbec@gmail.com> wrote:
>
> On Thu, Mar 12, 2015 at 10:24:17AM -0700, John Stultz wrote:
>> Convert the uptime output to use the timespec64 structure.
>
> That looks correct but the changelog lacks a reason :-)

Yes, sorry. I'll add a better rational to the next revision.
thanks
-john
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 33de567..a0b262f 100644
--- 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 timespec idle;
 	u64 idletime;
 	u64 nsec;
@@ -20,12 +20,12 @@  static int uptime_proc_show(struct seq_file *m, void *v)
 	for_each_possible_cpu(i)
 		idletime += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE];
 
-	get_monotonic_boottime(&uptime);
+	get_monotonic_boottime64(&uptime);
 	nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
 	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
 	idle.tv_nsec = rem;
-	seq_printf(m, "%lu.%02lu %lu.%02lu\n",
-			(unsigned long) uptime.tv_sec,
+	seq_printf(m, "%llu.%02lu %lu.%02lu\n",
+			(unsigned long long) uptime.tv_sec,
 			(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
 			(unsigned long) idle.tv_sec,
 			(idle.tv_nsec / (NSEC_PER_SEC / 100)));