From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755282AbbCLRYL (ORCPT ); Thu, 12 Mar 2015 13:24:11 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:34109 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754516AbbCLRYI (ORCPT ); Thu, 12 Mar 2015 13:24:08 -0400 From: John Stultz To: lkml Cc: John Stultz , Arnd Bergmann , Andrew Morton , Cyrill Gorcunov , Serge Hallyn , Dave Hansen , Thomas Gleixner , Alex Thorlton , "vishnu.ps" Subject: [RFC][PATCH] sysinfo: Use timespec64 accessors for calculating uptime Date: Thu, 12 Mar 2015 10:24:03 -0700 Message-Id: <1426181043-2453-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As part of the y2038 effort, convert sysinfo's uptime calculation to use the timespec64 based accessor. Uptime isn't likely to ever exceed a s32, so this doesn't actually bring much in the way of change, but it is done for consistency sake as we deprecate 32bit internal interfaces. Cc: Arnd Bergmann Cc: Andrew Morton Cc: Cyrill Gorcunov Cc: Serge Hallyn Cc: Dave Hansen Cc: Thomas Gleixner Cc: Alex Thorlton Cc: "vishnu.ps" Signed-off-by: John Stultz --- kernel/sys.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/sys.c b/kernel/sys.c index a03d9cd..6d2d700 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2260,12 +2260,16 @@ 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); - info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); + get_monotonic_boottime64(&tp); + /* + * y2038: uptime is unlikely to ever grow beyond an s32 + * so this cast to a long shouldn't be an issue. + */ + info->uptime = (long)tp.tv_sec + (tp.tv_nsec ? 1 : 0); get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT); -- 1.9.1