From patchwork Sat Jan 24 01:43:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 43714 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 86D20218DB for ; Sat, 24 Jan 2015 01:44:26 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c13sf261755eek.1 for ; Fri, 23 Jan 2015 17:44:25 -0800 (PST) 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Wm0/NoXtmT9EaQ6MUg8Zl1ujlWiHDjcU7wsSVLBWE88=; b=ScSmHhN9a4TF9pgipw8xDT4g8sC+BYnTFTU5813RfbPnrctGkc0CoCGilpVQiPYxfw aM3OoMEg6RT2a9tL0O3sEiZ7Pl/T3iJ7Xsxs3m6bK6QYC3fDCkzUXlXs17GHbzMKzu9O 4IgdGSxXhqOF7DqwVMmTbvCWPAXa30U9C5CMaJSkyvD2gkUTPnNoZsqPA6zKGqf/EpRW /YOICYmI3Xwec7FtylCZMsgz3zv+vwAmMh4zFKR5WetCL5t+UwmnY362svMPC5gzfBBf 3SIeL5nXxK+3D2g5IFO6WSbVCBF7l5QboqN1wgcxcBO228ai2mxFbNPTdtijsnyZBHIW MVnA== X-Gm-Message-State: ALoCoQkZmNx9LLZWspsM7OVpMjeO6sF5hN43E7kmENdokJ8eL73Bj5TJcn5IPxbvnEqTfnl+0ZAi X-Received: by 10.152.170.201 with SMTP id ao9mr639053lac.5.1422063865766; Fri, 23 Jan 2015 17:44:25 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.137 with SMTP id 9ls316995lau.26.gmail; Fri, 23 Jan 2015 17:44:25 -0800 (PST) X-Received: by 10.112.220.36 with SMTP id pt4mr10077467lbc.15.1422063865519; Fri, 23 Jan 2015 17:44:25 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id o8si2804800laj.121.2015.01.23.17.44.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Jan 2015 17:44:25 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id 10so458418lbg.10 for ; Fri, 23 Jan 2015 17:44:25 -0800 (PST) X-Received: by 10.112.98.99 with SMTP id eh3mr9952774lbb.32.1422063865406; Fri, 23 Jan 2015 17:44:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.35.133 with SMTP id h5csp90278lbj; Fri, 23 Jan 2015 17:44:24 -0800 (PST) X-Received: by 10.66.221.135 with SMTP id qe7mr15711427pac.26.1422063858199; Fri, 23 Jan 2015 17:44:18 -0800 (PST) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com. [209.85.220.43]) by mx.google.com with ESMTPS id i3si3905690pdp.145.2015.01.23.17.44.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Jan 2015 17:44:18 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.43 as permitted sender) client-ip=209.85.220.43; Received: by mail-pa0-f43.google.com with SMTP id eu11so506429pac.2 for ; Fri, 23 Jan 2015 17:44:17 -0800 (PST) X-Received: by 10.66.156.229 with SMTP id wh5mr15768324pab.119.1422063857244; Fri, 23 Jan 2015 17:44:17 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id ci17sm3111170pdb.70.2015.01.23.17.44.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Jan 2015 17:44:16 -0800 (PST) From: John Stultz To: lkml Cc: Xunlei Pang , Arnd Bergmann , Thomas Gleixner , Ingo Molnar , John Stultz Subject: [PATCH 5/8] rtc: Update rtc-dev to use y2038-safe time interfaces Date: Fri, 23 Jan 2015 17:43:57 -0800 Message-Id: <1422063840-2837-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422063840-2837-1-git-send-email-john.stultz@linaro.org> References: <1422063840-2837-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@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.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Xunlei Pang Currently, rtc-dev.c uses y2038 problematic rtc_tm_to_time() and rtc_time_to_tm(). So replace them with their corresponding y2038-safe versions: rtc_tm_to_time64() and rtc_time64_to_tm(). Cc: pang.xunlei Cc: Arnd Bergmann Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Xunlei Pang Signed-off-by: John Stultz --- drivers/rtc/rtc-dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index d049393..799c34b 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c @@ -304,12 +304,12 @@ static long rtc_dev_ioctl(struct file *file, * Not supported here. */ { - unsigned long now, then; + time64_t now, then; err = rtc_read_time(rtc, &tm); if (err < 0) return err; - rtc_tm_to_time(&tm, &now); + now = rtc_tm_to_time64(&tm); alarm.time.tm_mday = tm.tm_mday; alarm.time.tm_mon = tm.tm_mon; @@ -317,11 +317,11 @@ static long rtc_dev_ioctl(struct file *file, err = rtc_valid_tm(&alarm.time); if (err < 0) return err; - rtc_tm_to_time(&alarm.time, &then); + then = rtc_tm_to_time64(&alarm.time); /* alarm may need to wrap into tomorrow */ if (then < now) { - rtc_time_to_tm(now + 24 * 60 * 60, &tm); + rtc_time64_to_tm(now + 24 * 60 * 60, &tm); alarm.time.tm_mday = tm.tm_mday; alarm.time.tm_mon = tm.tm_mon; alarm.time.tm_year = tm.tm_year;