From patchwork Mon Jun 18 14:07:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 138952 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3998920lji; Mon, 18 Jun 2018 07:08:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKFAyPFoZ16A27VqaATdsJvRaGVcAxMbBrhHsFN2sh3ptTeB5L5M4e6QFhbiqENBxLQiaGn X-Received: by 2002:a17:902:4545:: with SMTP id m63-v6mr14484282pld.268.1529330922062; Mon, 18 Jun 2018 07:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529330922; cv=none; d=google.com; s=arc-20160816; b=Vwg4Y1T4G9d3OXl3Qg+911bGLdoOGHl4KKcjqMad3koNEbFRvhYZ0bfcC2fPa8Oqcl PSDhJsUlriCW0NhPfgzcsAD91AJY1QM3EUDSBBPVLdbi6Fl1zkcwBEo/fQkzrYnyPowS Rm1aTlQ/su8CO40kwnRXJ0c2gaP6mDNz5LDBJMyIrkx2iy7/dfNRnAE1bc2rCi87yPjU b8y0vfFvW6LFYeC0nYUmv4F8OVX9AA4pBsXzSGXSV17OiYcjl3S02CnTdr3RvPZOpFgO NlaR4kSOrssms2qoagloxvSqOwcFmmWqCve1wR5Cj5H99G4eyQ/Lj4xgvLLEPPYdCbVK cQJw== 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=3jaoxA3DkYWz6WExkCMCF4kwpMHt/dCot65EJ0h5gE8=; b=reHwqlfiRAirqyi/HFOKXfNOH/xdv4nnVC32sovEHUfC6u9ZZ4h+avKtUQN0YLjTJV 88lYB2EpWD0qdmwPB8c5rQqGyKJ67FYVX1WalWWChY1syua5tBy6tlm+zcWWkPe8mZq0 3SNVyTW7OIUQZ+/6tuXd4JYBq5oFSxYD10mms/Ulm9J6TNemHGulSN2M8D0VR+oWHaKD jPma1LFLgwmfEJeAsJUJ7XcphaXBR8bpy3BhDNzqX8yWsz8/lz7UkrlzqljZO0m8n+eb ic5bOtZ/fbqOOOOAVd36Oa5Y90ylkqPFhs1m5KzZUIn9t/z8eTm5dsOnHqsIvklcUwIb Gdqg== 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 g17-v6si14607043plo.355.2018.06.18.07.08.41; Mon, 18 Jun 2018 07:08:42 -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 S1754690AbeFROIk (ORCPT + 30 others); Mon, 18 Jun 2018 10:08:40 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:33357 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754601AbeFROIh (ORCPT ); Mon, 18 Jun 2018 10:08:37 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0Mb8iR-1fnx6y0B8l-00KekP; Mon, 18 Jun 2018 16:08:15 +0200 From: Arnd Bergmann To: Thomas Gleixner Cc: y2038@lists.linaro.org, Arnd Bergmann , Ingo Molnar , Anna-Maria Gleixner , Deepa Dinamani , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] posix-timers: fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME Date: Mon, 18 Jun 2018 16:07:59 +0200 Message-Id: <20180618140811.2998503-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:KWcztfOL8CF0VfxuTS9pFEZN5Pz4QPo0cxd06aMQ3S4ucXfTmnN pa6lkzGkFn4M7g3ab+oJA16LLEDrEgnYusH7pTayUomDDBrB0075pgZEaXtqO/Bq1YkyN16 2L+J+EebgME7t28FnV6NTa3NKe+tH2HdNdf8VOS0sMVEP6OBgMdNkIcPBtN5AbYPMhQVVj4 9/guOoL0Z4VcZgRJikLrQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:uct43v7Tppw=:vUicSlTQrWWgXrn4a1rmOw tEunvrSw7KawJ1wB9xCYqliIiLVQuRgjnDwSGW5bqscIi9zgkddMZNyB7raUvrQTWcbPAijM9 yx/vZ5ODUDaVa4P0eGFh8DHx5Ve9+cM5nrpyAT7L/jaOgo1/cAqbSmw9q3FXU/F/sJcsV9eul p51JovstadcnaTezWbDWD0wIbpVhvbwX4HMHGHlwnxCUsZxgFbwGJ15kMMo0aJXOqFVzQZBe4 0Ten5SF47ARRMgs0so3Yg3qyoxXHHmpZxJrMyoj08pZbCGyQOwK/+LER6rnwADg3JcSjwxbH3 x2N/ffC+5miCvSCeX63v6oZLQkZ+TR+hFtxB/PYdr22e/xdPRC6stXwOHWDQ2NLJ4ZV0BhASj FdsywdQSHDMUtdKNlt/b602nCu/IaL9noCBprzxvLBDXbrPwTgcK1HvVzCCY+QYw0keI7M1wf OScel5vMB0qaPnDXuGecM+qc4YFHPiE6IBVQYqAYg/pyIN6csU4Ug2F7GKVZ82l+g4QhEh8Dd 6+U2zH0PBZzkEspLlemxZf72V6FfiMwOHnfraLiaHCuC2L2CniPZx9OxfxTNs3KMWp77MImOV cdOB/kEWRLIUwKDl8YUXPsS/cwO1pi9yx01N+epcuc+R8Dy4dtcmI5welIBWlI2oFrzyVthzq rHW/LvQ97977KQiDMlMwFZ2u+yckpn09p950MLOZt67ilD/BBX60wkrfWAMMB8p6QStY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit b5793b0d92c9 ("posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME") added support for building the nanosleep compat system call on 32-bit architectures, but missed one change in nanosleep_copyout(), which would trigger a BUG() as soon as we switch any architecture over to use it. This makes sure the TT_COMPAT handler is available when we need it. Signed-off-by: Arnd Bergmann --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 055a4a728c00..3e93c54bd3a1 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1659,7 +1659,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts) { switch(restart->nanosleep.type) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_COMPAT_32BIT_TIME case TT_COMPAT: if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp)) return -EFAULT; From patchwork Mon Jun 18 14:08:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 138951 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3998849lji; Mon, 18 Jun 2018 07:08:37 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK6Qn2lpl2+T6fK28WU3UbqOj2JJV7+dw0NZrVCWd7VxDW92HQyxzDfs/gdFkjCfnNMif5G X-Received: by 2002:a63:778b:: with SMTP id s133-v6mr10901547pgc.400.1529330917493; Mon, 18 Jun 2018 07:08:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529330917; cv=none; d=google.com; s=arc-20160816; b=hyDkC/DRWuODVijNmHwGX33mnLs9PRBffEW6z2YfYdxsdDmlWQWgXqY8b/6BvRITzV G9Omr/tPNwg9zwjzX4e85v0X8DEYtVKhfDKW2sfJi431Ks0mYMyxvoyn5zK4qyXq8CMR 449729ONu5KV/wy5UJldl/q3/yuRYqR2QT4GVJ5c0jUoQg1omClrScn5vNNqDDHH/wty hYo4DYF5S/JBK/auPTJ+kSp6xcv2FfhNh9pnbMmZy72b6byNEsrE33gvZqFH7cfsuaon pX+3ks9R2dRMZEm1dOpfXgjE+AnvKqd7BnYYBIpD/m+vrdjQnX0MabMRdFWbkaGkULri WCIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=kuzlm+xYhD7c8Uf+sQWBf+YlWK43ja4fgVZkK1P9ku4=; b=rB9fOOFlHhfTlWuydIusUeFikpKTmdsfP0bR5UH1DU7oYJg2nwgC+pdmhOdpOrP9sh O5QXeEaVy8PFDq1RNuBqGO7SGiri5U1rwM/Db08qI53LS1DLCSeOKrb1mEzVz+rc+qah /7dTwl6mfXljxbKY3Rz8ifeEdSAm2YOI2/Ph641kXlUZjpvKiAtor68LkD/RHn164lmF 9Qs5+f9a+sDVSbrfnMHXJFXY9HXM80kdLEOWXAnrG92wvTfH9mdUeck+O8GeTubeFS5L MmBjKKIF1ybEC3MHUXdaErRavS1s2gd+1T/S9dcwVILEljtqCNLThhBgZddMnJsTOLG7 Vptg== 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 g17-v6si14607043plo.355.2018.06.18.07.08.37; Mon, 18 Jun 2018 07:08:37 -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 S1754587AbeFROIf (ORCPT + 30 others); Mon, 18 Jun 2018 10:08:35 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:34079 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752835AbeFROIe (ORCPT ); Mon, 18 Jun 2018 10:08:34 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MfYYl-1fsKpY3PKt-00P2Sb; Mon, 18 Jun 2018 16:08:24 +0200 From: Arnd Bergmann To: Thomas Gleixner , John Stultz Cc: y2038@lists.linaro.org, Arnd Bergmann , Stephen Boyd , Deepa Dinamani , Al Viro , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] time: use ktime_get_real_seconds() in time syscall Date: Mon, 18 Jun 2018 16:08:00 +0200 Message-Id: <20180618140811.2998503-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180618140811.2998503-1-arnd@arndb.de> References: <20180618140811.2998503-1-arnd@arndb.de> X-Provags-ID: V03:K1:ILctjl/yi2BLphw2pskkao6oJ1ToCOp+B/AJwZs18nQpYNtvlOe 9mNdKLmwZU1Yy8ZjGLfqu23CdJmz1ci8C0eQRtkTe4MMW0LCweOgkYrP5I4KPixq6sXGGkG t1dcn2q+bWodb8KOoY67m7OB2hfm4nyr2yN2beoMYW2YmhGmSKsIuNmrNakHHHU/t/KrH+s KnxJDxHjyeqKmpMqcO4bw== X-UI-Out-Filterresults: notjunk:1; V01:K0:2OuSd07hyLY=:5HYrRiud3+Bbs0BYbiQsiE rNPhy+4ujHOtjNxdaKBS/3lUyaYv/2xnn9xj4dxcGM49CXMjf2oiYzc8tfoW1jN5GZXbj/ot6 D1s66894aKieyog88EBhwbmjt1U2+RitfY7V/38xJFbmV5lI9tFBjEtFMNJ62INcBp/hGGjkz g9reXhkZLcsZdV17br26pJo8VMfID+hU241BpR5hpRtlXKBdhEpCiSDFOa/YtCxGZLcI5NMDb NhesmhMoV5VRzFMc+PGlkWX7DLB6bP5UggTJrWw4epRFufKcM9jV+R+hlZmHASHzxFBdlrR5h i3Qbz/wnvLKwegAS1ZFFwhqgepAjq9Apfekyya81mwWX1wvgplyjBhxXo+R4vIIqLLRb+VJ5f PfhGhnfItg49VmgEJDsBTaknTPxNcbQdCEiIAYrY3CGxXyH1DSdtjyfzVEpP9YdPm2I1MIMLv paK7YarypxGpN9n/MbxJtjMRdsy8KMnZPbS37/kS5AoFNG3YdaY5lpvG/SQ/xl2VCLJVVnSsG czzoDei7iliBbfwlztCasB9vS2D2Z2f+1XOBc1/MOoSq6Ifb5b6maJmlIHMX4xGOeNiHFjmg7 dHtMa9M594G/dkRc4q6fPgKOdKjZPxKByyMFZPEp+NbkwqfX9QSo0/KpSTL0YnZx4snC/Y2+8 G9XgZ0zHIJXvbDdkgPqiQbUT6vIdMKcBqUDYT8msRdkztfM9CzRntddoysWZ3TdrqdxY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both get_seconds() and do_gettimeofday() are deprecated. Let's change the time() implementation to use the replacement function instead. Obviously the system call will still overflow in 2038, but this gets us closer to removing the old helper functions. Signed-off-by: Arnd Bergmann --- kernel/time/time.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/kernel/time/time.c b/kernel/time/time.c index 8e4f3fd2f84b..90867ece5c09 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -63,7 +63,7 @@ EXPORT_SYMBOL(sys_tz); */ SYSCALL_DEFINE1(time, time_t __user *, tloc) { - time_t i = get_seconds(); + time_t i = (time_t)ktime_get_real_seconds(); if (tloc) { if (put_user(i,tloc)) @@ -106,11 +106,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) /* compat_time_t is a 32 bit "long" and needs to get converted. */ COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc) { - struct timeval tv; compat_time_t i; - do_gettimeofday(&tv); - i = tv.tv_sec; + i = (compat_time_t)ktime_get_real_seconds(); if (tloc) { if (put_user(i,tloc)) From patchwork Mon Jun 18 14:08:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 138953 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3999241lji; Mon, 18 Jun 2018 07:08:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL+YBPhW1jWZWa8xvMyU2zdQ2wdzs9kag0qgGz7ZP2NEqCI705i5dAfrcnFG9940dUnYi3i X-Received: by 2002:a17:902:206:: with SMTP id 6-v6mr14336307plc.294.1529330936867; Mon, 18 Jun 2018 07:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529330936; cv=none; d=google.com; s=arc-20160816; b=KEpOsluNoTbZ/LSUXHPXOYxTSV4NQnNHp2sLtxpm3blEBc7kLi16HczcfeEVKNJsJE /YTDF9zwCYTqOoruWMjuVa8FSK0tg07ezjE0TU790IsF1FaguN47WuuqhbdHTkx7KaML +BkY05Tlvt0GmDqJmG/S/2Aik8I+TFK6YTpAu6TNVpbweafO+oZUv3M8gXotj18/FNS7 HMGj7zZiiR405boSm8dFf/vJ9tBGNK5WHAJ4I2laDOzTC6Xw8bInFFg+HKHMqajDMx9E lig2+uUf9WY8PmBasyVIpevvNGeb3zC20jliAm36VcA1dU3n5MFzuZYZLmRPZ3sO7vX+ VYgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Pr864r8o8pBz70CbFp5ISriT7uy/eprlC7QsRdp3Dr8=; b=JI5MZ7cijLbovjDxoo1LK7q2H+In1PUBMMxeY62m4IyIm65AhKQDMP7GHf3p5xFfGo 6rqP9RcVAW+16zDfGqAR6MXZ0RE4pQx/xLu5Bq3635Cc22nLDGpITh3s2gahHTRKektr FG20yVcF00erTwv6TpXq/rF6lIKTKqLOpqjNXYUbRveENDsrrRB5uAcdsn+XiIysrsm5 Vdu7NNSIVPsXzI3QVY0JgOrtkiLh5KW28LQmQ66/d+xyrGIOeQMJwDJBYfrgPrbfrGl5 C4rUZpyNN9DdX3eSQ5l2Tndtks2MyHVnV4VvQSaHShFyFH+/XpWVcyCmCCiUtKR7pReX 41zQ== 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 g17-v6si14607043plo.355.2018.06.18.07.08.56; Mon, 18 Jun 2018 07:08:56 -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 S933830AbeFROIz (ORCPT + 30 others); Mon, 18 Jun 2018 10:08:55 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:50337 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754601AbeFROIx (ORCPT ); Mon, 18 Jun 2018 10:08:53 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MC1MO-1fM58435wO-008vJO; Mon, 18 Jun 2018 16:08:40 +0200 From: Arnd Bergmann To: Thomas Gleixner , John Stultz Cc: y2038@lists.linaro.org, Arnd Bergmann , Stephen Boyd , Ingo Molnar , Miroslav Lichvar , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] timekeeping: use ktime_get_real_ts64() instead of getnstimeofday64() Date: Mon, 18 Jun 2018 16:08:01 +0200 Message-Id: <20180618140811.2998503-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180618140811.2998503-1-arnd@arndb.de> References: <20180618140811.2998503-1-arnd@arndb.de> X-Provags-ID: V03:K1:Wjc6Acd7epJAakSEfRIj6Q0bDR2aY4j5OVhwZfl6AS4iA9yxzzS LX80oCYQRT8sPr9mePhBUrkuq4cDxK2orqsufvKQ9xajCGzVW3dD8D1luWs7uywT4SHTRUo PQF7u0BwvTRA0AV0VldV9mHl0jqvpcYcU1aGHUIV6IojEoyXQKNpiOuZ0SyP0n7hYQ/jxSZ Asqhq0SHcVIkUhDSLre8Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:K1Xd0KNhYVY=:YxRkWWetJz0fF4O9xKXQHN LYxYKkkyWuCZ9qfzrPZe0unqU4ZxoSt7sOioub+aeFqVWMJRwwTfgGOoE+kpBkhtSBQWCgXvV 3+Xh4I78Kne1bTwHcRhwVd89bKkrtvMl18F86+Km8GAsQUjEaBJHSW86lq5djcWcqc9YXVodH gWh3NXuCzDMBMu9wRxh8Elpw0ja/2Z1tlvlMGWWtcss8bJQtozCwGqmJhuEv2LPqsplDZn2pc WHHI3YmcWhATD1yGcChWh8F5ea6ebt2DJL01LwglKZ+HR8d7J+ChNtpL+iIs6nwuFoSp53mqN euPsh8ZQQHsufa1vRYs4+bnxz6OL/wXz5EKSRYv0u71FpN6mI15xAF2RxU/mODTj5ZzuEkupG 1L3i/uGq8oUHX+P0Cf9vaKv432y5W/HDzviFvBHTAGBU18e9QiSh58QEcAC13qQDs8vo+TB7G VlLRZnlInNZ0VyYnCi9ZkZtLcg13yV6Qrb89KTNvMtNN4E5AT6AZVj2AhyPtE9vxtpy8mWi47 LfTt4Vf5JeQPwMJMwNm2L9JllOzDi/OnVa4gZ3/+o+qL1rSO4UhM+d/fG2xxeT66A4mOohph5 Jy2bF5ydq2O7y+t7LckR3WDWcKb49+IGJSkEUk3r8Fc0xg2nIXjSVY7IkaCY8CJa5OCWDTH/2 LhHn2MmUiaYrCnB3JKnVgtvzoQccM2ULo4+38/GffwGWt+SdUXE2QJCnscS9cR6Byp10= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The two do the same, this moves all users to the newer name for consistency. Signed-off-by: Arnd Bergmann --- kernel/time/ntp.c | 6 +++--- kernel/time/timekeeping.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index a09ded765f6c..10a79053e82f 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -502,7 +502,7 @@ static void sched_sync_hw_clock(struct timespec64 now, { struct timespec64 next; - getnstimeofday64(&next); + ktime_get_real_ts64(&next); if (!fail) next.tv_sec = 659; else { @@ -537,7 +537,7 @@ static void sync_rtc_clock(void) if (!IS_ENABLED(CONFIG_RTC_SYSTOHC)) return; - getnstimeofday64(&now); + ktime_get_real_ts64(&now); adjust = now; if (persistent_clock_is_local) @@ -591,7 +591,7 @@ static bool sync_cmos_clock(void) * Architectures are strongly encouraged to use rtclib and not * implement this legacy API. */ - getnstimeofday64(&now); + ktime_get_real_ts64(&now); if (rtc_tv_nsec_ok(-1 * target_nsec, &adjust, &now)) { if (persistent_clock_is_local) adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 4786df904c22..77c436a0070b 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -2310,7 +2310,7 @@ int do_adjtimex(struct timex *txc) return ret; } - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); raw_spin_lock_irqsave(&timekeeper_lock, flags); write_seqcount_begin(&tk_core.seq);