From patchwork Wed Jul 11 12:44:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141735 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp243667ljj; Wed, 11 Jul 2018 05:45:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfZEz/Q2D4vAkCAu9iHYe1pl8pxq8jrAAIih8RZNqfi39lS8CDqT0FiLobUW4ztSCkDrpeP X-Received: by 2002:a65:55c6:: with SMTP id k6-v6mr26289395pgs.6.1531313121556; Wed, 11 Jul 2018 05:45:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531313121; cv=none; d=google.com; s=arc-20160816; b=sfdSSaRhEvyRo8mUYRRQe+mz6ncWpsr2kMPfcG0f3bqOYLqEa5f3vc7YHglbQyMeLX rQbm8d0Klehm093jYBRJcLHkN4Jskx81a/pqIZJJYSDzKUUAVmL2BupuvO4ZJXw+pPpA 1jTnhEQ6aYnycrei6OrLE4ohmtbaPOy4ehtURqRCQovLpsVDmEkmGDJQqZCCZMpbSkFs mE8Hos+r4HhdyQOoaKWLSnF43/SDeYHY2KAoybRWTgYcqkEKjiG/50QFpRMZzgE6D8qL 3UGx39zYPhksLUaC1KLVLhb9X+8atcn2qQpVRrss5/wP/ReibbWiWHEFQ5c2UPr/8iwV 8ahw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=9xBV6ZgEPiXHkNU6NFjzZ8iaCdVS4qEadLD6CFIKnQs=; b=QbkXpw9vl4fPW4HHoP+vXyceLdk1qbhdTOO0NtWrDRen7xI9sSRUw9pgPUS6KMcmg4 psFEbrcybTQ96I+sM1uBic9uud941gMyMmddxNDdQq6LaHvpZYmZBD3nwRZXDHTwa76Y 5nw5wKgM9zGD48mRJ+1pSxBeCE/2jAq9dDUYuGHOMdy8gEig498RAhvYd30CvEKtXzrI hRPhSYUdGWiCTSMBmcgobIsC0GFKcEFl1vpNap7gu8Ia/FcAhueMS182MRzS4cdv2FsV J55tD+qLpNPo+AhelQoakdf0hw6XHj0I5011U5WD+tb/bJXh3A8wivC6g2AzZERDPajS WJqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z15-v6si17370364pga.117.2018.07.11.05.45.21; Wed, 11 Jul 2018 05:45:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732411AbeGKMt2 (ORCPT + 23 others); Wed, 11 Jul 2018 08:49:28 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51846 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726457AbeGKMt2 (ORCPT ); Wed, 11 Jul 2018 08:49:28 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTL2h-1fTVRV3hSB-00SOYN; Wed, 11 Jul 2018 14:44:58 +0200 From: Arnd Bergmann To: Andrew Morton Cc: y2038@lists.linaro.org, Arnd Bergmann , Stefan Richter , linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] [RESEND] firewire: use 64-bit time_t based interfaces Date: Wed, 11 Jul 2018 14:44:42 +0200 Message-Id: <20180711124456.1023039-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:o1AIODU37O5wgCLgawhC4au4MwpuxaHxlYWMv+7fowyQSv+Zy+N P6syUZKnuyFr9Ztd9xIarQUrnxq0xw8AbWJgioq9wouylwDkOq5voPoojpb7GyDw+ZNeGBp iJipePfBeyEsUshZuLMuXD19NoBr305IQG0Jf/UsyhEwsjsnzCiLFq2y8wl20B/zjn81EFq jnqkBMJcR4df+SCPqbR2A== X-UI-Out-Filterresults: notjunk:1; V01:K0:LdpBKiM93TU=:TW+kLa40CsW0xYjfqzDgls bq7f2neiZqWD0OlRsmP+MKYYHcaVvlqnggRw++cXM2jlm8VBLI6BabiMuKQThC9gLCNIpOvXq Gsq/tHYu4K/Z6SMyttuo7WnHQxtHFxK5XeRu+7diVQT2uE2MGe92KIMK1TIUohm9FG+9uFmx1 Oq7sCfWwLEMAclvtfNcruQRlZ3fE5/tI/DjLQnPAKgkdl4cQBBujXwyJEVCzDqquf8tWyibaC u7eSKrSCK9OW+0rBancdgpJpWiLIT02ysMbAy1l6d9gQswU8kySqQDm6m4EMprD42GlfI8Ydv xaJV7YNjy41pS395BCJbcgk0Ame3rrKVti0KLYvOXl0vD0vUm3ihnk4uSdTeJWvUdO7Mx1KNe IN28OeeIWN53gDDeD6a1xuJZmvaYYviXilS/6FbOjjns8mOBtWzjYPQi01q3aPsCC7wtNsDMm /9S7Jkv5Vcg+YyuRhoTRxTAoCpMj4BFCI+q7Z5hhFnckZCugdHajGxNXihvZkp0udrStlkz+s CAU9iqRVv5h8vXtupmvHI9Jh4uoPGbmdrdEGVGwKqDimukbGc9nQJPv2bdYaehICTRKdZzvX3 R0Df4vuoKBFQLVUMPCD3xsK0yNmX9OedWhHruFH0opvB0k2EPzinF8GL+PZFbJZ/MAxryo6TX 5vdKhhOusb57KSob3s92QIHIz5Z41RksYUuf1x+KlwDo80oEp0FF50MBmDQRjfO5zO7s= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 32-bit CLOCK_REALTIME timestamps overflow in year 2038, so all such interfaces are deprecated now. For the FW_CDEV_IOC_GET_CYCLE_TIMER2 ioctl, we already support 64-bit timestamps, but the implementation still uses timespec. This changes the code to use timespec64 instead with the appropriate accessor functions. Signed-off-by: Arnd Bergmann --- Sent originally on Jun 18, but got not reply. I notice that Stefan Richter has not been active on the mailing lists since February 2018. Andrew, could you pick it up in the meantime? --- drivers/firewire/core-cdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index f0587273940e..d8e185582642 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1205,7 +1205,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) { struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2; struct fw_card *card = client->device->card; - struct timespec ts = {0, 0}; + struct timespec64 ts = {0, 0}; u32 cycle_time; int ret = 0; @@ -1214,9 +1214,9 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME); switch (a->clk_id) { - case CLOCK_REALTIME: getnstimeofday(&ts); break; - case CLOCK_MONOTONIC: ktime_get_ts(&ts); break; - case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break; + case CLOCK_REALTIME: ktime_get_real_ts64(&ts); break; + case CLOCK_MONOTONIC: ktime_get_ts64(&ts); break; + case CLOCK_MONOTONIC_RAW: ktime_get_raw_ts64(&ts); break; default: ret = -EINVAL; }