From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587AbbEFQc6 (ORCPT ); Wed, 6 May 2015 12:32:58 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54973 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752410AbbEFQbC (ORCPT ); Wed, 6 May 2015 12:31:02 -0400 From: Arnd Bergmann To: y2038@lists.linaro.org Cc: baolin.wang@linaro.org, tglx@linutronix.de, albert.aribaud@3adev.fr, john.stultz@linaro.org, bamvor.zhangjian@linaro.org, ruchandani.tina@gmail.com, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, libc-alpha@sourceware.org, Arnd Bergmann Subject: [PATCH 18/19] y2038: introduce jiffies_to_timespec64 Date: Wed, 6 May 2015 18:30:25 +0200 Message-Id: <1430929826-318934-19-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1430929826-318934-1-git-send-email-arnd@arndb.de> References: <1430929826-318934-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:IQdVecWsoTvmIkedvSYqUh7cp1IQPf3lsE3qp/xS22qktxY/ojD yC22guasVMGhyy30+hTEvDUeMYkNIUfgziQQetw5upkEmiZIrK1B/Osq0lx8o0y1y+wIIt9 VoMWxjDrj/EslNRn58A2HDdg1tS7CG8/KXBHlwvQExTitQ92IKdmQaypzO9tQDLJ5IOzpm3 xiq2WRipHLiQAOhPmi1/A== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Needed for converting sys_sched_rr_get_interval Signed-off-by: Arnd Bergmann --- include/linux/jiffies.h | 12 +++++++++--- kernel/time/time.c | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 2aeb872f5547..6647257fa3da 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -301,9 +301,15 @@ static inline unsigned long timespec64_to_jiffies(const struct timespec64 *value return __timespec_to_jiffies(value->tv_sec, value->tv_nsec); } - -extern void jiffies_to_timespec(const unsigned long jiffies, - struct timespec *value); +extern void jiffies_to_timespec64(const unsigned long jiffies, + struct timespec64 *value); +static inline void jiffies_to_timespec(const unsigned long jiffies, + struct timespec *value) +{ + struct timespec64 ts64; + jiffies_to_timespec64(jiffies, &ts64); + *value = timespec64_to_timespec(ts64); +} extern unsigned long timeval_to_jiffies(const struct timeval *value); extern void jiffies_to_timeval(const unsigned long jiffies, struct timeval *value); diff --git a/kernel/time/time.c b/kernel/time/time.c index 4d96236c07b0..5e71dbd36fff 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -588,7 +588,7 @@ __timespec_to_jiffies(unsigned long sec, long nsec) EXPORT_SYMBOL(__timespec_to_jiffies); void -jiffies_to_timespec(const unsigned long jiffies, struct timespec *value) +jiffies_to_timespec64(const unsigned long jiffies, struct timespec64 *value) { /* * Convert jiffies to nanoseconds and separate with -- 2.1.0.rc2