From patchwork Fri Jun 17 16:15:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102146 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp362397qgy; Fri, 17 Jun 2016 09:14:17 -0700 (PDT) X-Received: by 10.66.134.172 with SMTP id pl12mr3210375pab.66.1466180057089; Fri, 17 Jun 2016 09:14:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y137si13115740pfg.217.2016.06.17.09.14.14; Fri, 17 Jun 2016 09:14:17 -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 S933840AbcFQQOM (ORCPT + 30 others); Fri, 17 Jun 2016 12:14:12 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:60075 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579AbcFQQOK (ORCPT ); Fri, 17 Jun 2016 12:14:10 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M0zHj-1bXgTu3VE7-00v8F3; Fri, 17 Jun 2016 18:13:53 +0200 From: Arnd Bergmann To: Chris Metcalf Cc: y2038@lists.linaro.org, Richard Cochran , Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: tilegx: use correct timespec64 type Date: Fri, 17 Jun 2016 18:15:30 +0200 Message-Id: <20160617161540.1362545-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:+KNgiIgVQwa2hTokPdoWvzZ0CuMNkQ1b7FrJgCgbtbtuJnKWFx3 QCPuA1hgqB/xO64F8ZA+nZbc8Un3F9cAHuIXvW5aAQSuOajlbQDGNLUP4h1z1KZASjruDX8 dOFey1WE/JtRasKlX2jWrhxsWpjDT7OhBUps5cA47RXwpMi80c9+C0sAdWgkamN2IjrBvnN xA2LeFnh5Hbryeia8/09A== X-UI-Out-Filterresults: notjunk:1; V01:K0:Aoq/f1KGs2U=:0eJFtBZDEkr7rsh2vVeFN6 NQXb+7W7JLyM1ZZWxA2P9LhstMhJbI+29ZWXN/qiailPWRLTN18sl6sqt384xhNf4PNLcgNP3 LFb66/7Gg6LbziLblURMzsnTmBVLtMKNU/l2D1E2SjcaJ8A5pDl4Pk/hR5AL4AxVk2Vbimyz3 ctx6UKeG5kEHWysro1UB5wsGyriWLRMkCEcWXLrrF+1Q8SYy+pOkn/igXEIlgrbqBYQhS400G ghfJb+vdTFk5kNEQr05nqNT/3+3bUzQztsefGPeHFmflDnDRAmWjw2pjPf46pHvCQWG5PvsAh ZCth2IQrOUJ+ye2TjAAqPQesC3h6uLqAT/6Daz0dHGy7vquEGSAkZapoD+xt0RLHZZLG47MAp F7mjNBDVcu5oSMgMwucjq6oTz65MfIoROp/iLCp1poTO7g2Ars4ZJNDt/j8UGc5IsnDmNBCWd xonlnw8EUwS/+HwkKftSTuwYspLFYU2c6vyVJm1KEe5tfnRRUoxjYnJrRKps15NBpBAwZ0wWc vdAt+1inGd7bU/675Y3zN4IJ2Zas9+hnslw0oZ8dBl6rAlUbjZz2d7/3bBTDfwKD8apf42aLv +3jTpHbAGFhEPT791o6MVCc8nG/CQtOie/8xhx1fcOLr71QRG0DU+lgF+yRTa+yK1/1g6pa8L U2n1z38qlzT1Dix792zV5RsGNwsNtTF9m/zPoUn/hUHz2VbXkdDY9eoQbYphoilWlf7I= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The conversion to the 64-bit time based ptp methods left two instances of 'struct timespec' in place. This is harmless because 64-bit architectures define timespec64 as timespec, and this driver is not used on 32-bit machines. However, using 'struct timespec64' directly is obviously the right thing to do, and will help us remove 'struct timespec' in the future. Signed-off-by: Arnd Bergmann Fixes: b9acf24f779c ("ptp: tilegx: convert to the 64 bit get/set time methods.") --- drivers/net/ethernet/tile/tilegx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 0a15acc075b3..11213a38c795 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -462,7 +462,7 @@ static void tile_tx_timestamp(struct sk_buff *skb, int instance) if (unlikely((shtx->tx_flags & SKBTX_HW_TSTAMP) != 0)) { struct mpipe_data *md = &mpipe_data[instance]; struct skb_shared_hwtstamps shhwtstamps; - struct timespec ts; + struct timespec64 ts; shtx->tx_flags |= SKBTX_IN_PROGRESS; gxio_mpipe_get_timestamp(&md->context, &ts); @@ -886,9 +886,9 @@ static struct ptp_clock_info ptp_mpipe_caps = { /* Sync mPIPE's timestamp up with Linux system time and register PTP clock. */ static void register_ptp_clock(struct net_device *dev, struct mpipe_data *md) { - struct timespec ts; + struct timespec64 ts; - getnstimeofday(&ts); + ktime_get_ts64(&ts); gxio_mpipe_set_timestamp(&md->context, &ts); mutex_init(&md->ptp_lock);