From patchwork Mon Oct 27 05:46:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39547 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 756AF24026 for ; Mon, 27 Oct 2014 05:47:49 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c13sf811119eek.4 for ; Sun, 26 Oct 2014 22:47:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=iCkILYoVPHzf9twLkfodNy7LkJ6f7P8hzYPWdI2JuIA=; b=Jbn8qMaoNZxb3xm0jMy4s4Q8QQrRPrwWymt+laEytccaW6W4FCQv11ktCicM43/z5t 4DYe/AmKAyGpoM0c4v5JTgmvi+J5giDeeqH2rqoTzWHzVS7f8WrQOFuSyq95AOjlsD5q jHb8FmxGWYeHTDrIMUb2E0As3r+y1dQQz6Md+JUe61Y8mloSmV1M/sbw6vTGRMtiWUeC rFg5qBtYQ80hpGPIms9+Pu4lyEgR6oJBs2LDzQcTW1teCcl0+ZEY/CqeOQ8XUf6I2KhC nXL7QjD4oLmkJpya9fCC122K6mWIrqF+2R4Qep3xlhaA1EFj9JTknqlgMp3IOD1xc1zA XoNQ== X-Gm-Message-State: ALoCoQlJcZlDozZqJ3Ro2njKcSNw5qQRmWZfgMDVxTd/zP9a/pb2swsEgO/G26NRWZ5sh+nlXu4p X-Received: by 10.112.97.35 with SMTP id dx3mr9049lbb.20.1414388868374; Sun, 26 Oct 2014 22:47:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.229 with SMTP id h5ls688659lam.4.gmail; Sun, 26 Oct 2014 22:47:48 -0700 (PDT) X-Received: by 10.112.137.202 with SMTP id qk10mr20999007lbb.0.1414388868204; Sun, 26 Oct 2014 22:47:48 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id w6si18214505lad.65.2014.10.26.22.47.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id pv20so5131116lab.20 for ; Sun, 26 Oct 2014 22:47:47 -0700 (PDT) X-Received: by 10.153.8.164 with SMTP id dl4mr20980746lad.29.1414388867667; Sun, 26 Oct 2014 22:47:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp235694lbz; Sun, 26 Oct 2014 22:47:46 -0700 (PDT) X-Received: by 10.66.252.34 with SMTP id zp2mr22497044pac.64.1414388866085; Sun, 26 Oct 2014 22:47:46 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xk2si9682613pbc.66.2014.10.26.22.47.45 for ; Sun, 26 Oct 2014 22:47:46 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752226AbaJ0Frc (ORCPT + 26 others); Mon, 27 Oct 2014 01:47:32 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:38831 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751368AbaJ0FrX (ORCPT ); Mon, 27 Oct 2014 01:47:23 -0400 Received: by mail-pa0-f47.google.com with SMTP id kx10so4759271pab.20 for ; Sun, 26 Oct 2014 22:47:23 -0700 (PDT) X-Received: by 10.66.179.140 with SMTP id dg12mr22351730pac.31.1414388842873; Sun, 26 Oct 2014 22:47:22 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id jq5sm9723922pbc.32.2014.10.26.22.47.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:22 -0700 (PDT) From: "pang.xunlei" To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: John Stultz , Thomas Gleixner , Alessandro Zummo , "pang.xunlei" Subject: [PATCH RFC 05/12] time: Convert rtc_tm_to_time_unsafe() to rtc_tm_to_time() in rtc_hctosys() Date: Mon, 27 Oct 2014 13:46:35 +0800 Message-Id: <1414388802-5866-4-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> References: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pang.xunlei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The kernel uses 32-bit signed value(time_t) for seconds since 1970-01-01:00:00:00, so it will overflow at 2038-01-19 03:14:08 on 32-bit systems. We call this "2038 safety" issue. As part of addressing 2038 saftey for in-kernel uses, this patch creates no functional change in existing users, and converts rtc_tm_to_time_unsafe() to rtc_tm_to_time() in rtc_hctosys(). Signed-off-by: pang.xunlei --- drivers/rtc/hctosys.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c index 4e9a5c6..c80723f 100644 --- a/drivers/rtc/hctosys.c +++ b/drivers/rtc/hctosys.c @@ -26,9 +26,10 @@ static int __init rtc_hctosys(void) { int err = -ENODEV; struct rtc_time tm; - struct timespec tv = { + struct timespec64 tv = { .tv_nsec = NSEC_PER_SEC >> 1, }; + struct timespec ts32; struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE); if (rtc == NULL) { @@ -52,16 +53,17 @@ static int __init rtc_hctosys(void) goto err_invalid; } - rtc_tm_to_time_unsafe(&tm, &tv.tv_sec); + rtc_tm_to_time(&tm, &tv.tv_sec); - err = do_settimeofday(&tv); + ts32 = timespec64_to_timespec(tv); + err = do_settimeofday(&ts32); dev_info(rtc->dev.parent, "setting system clock to " - "%d-%02d-%02d %02d:%02d:%02d UTC (%u)\n", + "%d-%02d-%02d %02d:%02d:%02d UTC (%llu)\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, - (unsigned int) tv.tv_sec); + (unsigned long long) tv.tv_sec); err_invalid: err_read: