From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755630AbcFQTzK (ORCPT ); Fri, 17 Jun 2016 15:55:10 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:64111 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753608AbcFQTzE (ORCPT ); Fri, 17 Jun 2016 15:55:04 -0400 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: y2038@lists.linaro.org, Arnd Bergmann , Ian Abbott , H Hartley Sweeten , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: comedi: avoid using timeval Date: Fri, 17 Jun 2016 21:56:15 +0200 Message-Id: <20160617195640.1956208-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:94xJdNMJeHnf448aaeOytc6VpTwW/RSrMNJJQtzdJFYEEhEvkmR 6Y7yDZxJXkqCyuD+vIxRbKXXYEdCKE2DCVd9XLIn0LZASTcfUqi4RurSBpj77+Gdykr9kQl jP5HakUDfIdE9ulCGyqf3i6sQJzaVNfPSdR0dRgXt5V8nFrpE+iuDErPol1jcTku5QvWuHG qaF5GSBsevtflxH5jWw6g== X-UI-Out-Filterresults: notjunk:1;V01:K0:Hvjo0LVvTcI=:myCbCIxzcCPKLL3jxaRpfQ VbPAo7eWufuq7Vs0YesLJMps6xS0WSsBWhCq5j/oB5ORuUi4CfB9LxGpYJR55RM0Sid2Y741M ikKQlTpJkjsv3c082+aQATZ1gcCIazIfx1mE6uTa9M5tQYVPW5VJO9yp+b38CWRgVjSWl9QK8 E5asiB6it/h5zjeVWCtsSDkWNFk5/86N6mr5l+5Ttex6d5R4x3+iaiSe6QtNfsL8SYCOBJDzN yjcbe4xLe+U4sX8Q/vOo1cAayfHSxbMUmgCL8rMtvag8NvP3uvhmUjwyI2kojQR9Gbrmhy/yB k3YFd42nBJ/mHCMV6rZXqjJo+i2onrobM4MF/6nHzySbCn/UwsRz8ANW0NjbWRk6bMqTCoRV0 TiMR1p6MpB1YitZ7OSLaYRnXJO72GHwpI848e/utGQRI8iNF7Qg3ItTSrsxzqUxcfW4o0B89u o1CuzyPcoiv1G7yugQGkd0qv92XyYMmrOXaD6wNyHJsYRHu9GBMxEf/8qa8WXRZH2w1JvqqK1 UfT/oqmeLFz/bDvfutD9QYSQin5l/N23sotb3KYY9feSUfbE1EfL0bknAKZz+k8o12pDGcn9a 060FIq7HPHcW8PQRvkEgL4Q/wG3fJPhNIK25GVNzEU/bqW1pgCjRSG0HOQFO5sm2jBb+Kt0Oq s858SQdT/5HM+FpkH9an9/EDkP8CgT3yctYgZCppnxSKt6i/fMiz2G96h9Uf0E56WO1Y= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Comedi uses 32-bit seconds for its timestamps, on both 32-bit and 64-bit machines. For all I can tell, this was originally meant as a 'timespec', which would overflow in 2038 because of the use of a signed 'long' on 32-bit machines, but it is now used as an array of two unsigned 'lsampl_t' values in comedilib, which will only overflow in 2106, on both 32-bit and 64-bit machines. In an effort to get rid of all uses of 'struct timeval' in the kernel, this replaces the internal code with a call to ktime_get_real_ts64() and a comment at the location of the conversion. Signed-off-by: Arnd Bergmann --- drivers/staging/comedi/comedi_fops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 629080f39db0..10a8a9245925 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1256,16 +1256,17 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, switch (insn->insn) { case INSN_GTOD: { - struct timeval tv; + struct timespec64 tv; if (insn->n != 2) { ret = -EINVAL; break; } - do_gettimeofday(&tv); - data[0] = tv.tv_sec; - data[1] = tv.tv_usec; + ktime_get_real_ts64(&tv); + /* unsigned data safe until 2106 */ + data[0] = (unsigned int)tv.tv_sec; + data[1] = tv.tv_nsec / NSEC_PER_USEC; ret = 2; break; -- 2.9.0