Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869AbaAMKpX (ORCPT ); Mon, 13 Jan 2014 05:45:23 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:38699 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbaAMKpT (ORCPT ); Mon, 13 Jan 2014 05:45:19 -0500 X-AuditID: cbfec7f4-b7f796d000005a13-90-52d3c3be05c5 From: Alexey Perevalov To: linux-kernel@vger.kernel.org, john.stultz@linaro.org Cc: Anton Vorontsov , anton@enomsg.org, kyungmin.park@samsung.com, akpm@linux-foundation.org, cw00.choi@samsung.com, Anton Vorontsov , Alexey Perevalov Subject: [PATCH v2 1/3] kernel/time: Add new helpers to convert ktime to/from jiffies Date: Mon, 13 Jan 2014 14:43:53 +0400 Message-id: <1389609835-24377-2-git-send-email-a.perevalov@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1389609835-24377-1-git-send-email-a.perevalov@samsung.com> References: <1389609835-24377-1-git-send-email-a.perevalov@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgluLIzCtJLcpLzFFi42I5/e/4Nd19hy8HGfw6zWEx9+55Fos569ew WVxsvc1icXCrpkXr405Wi+tfnrNanPmta3G26Q27xeVdc9gcOD0m9H9i9LhzbQ+bx4kZv1k8 +rasYvR4fHg1i8fnTXIBbFFcNimpOZllqUX6dglcGR/bzQv6JSuu7N3J3sD4RqSLkZNDQsBE 4tGGmawQtpjEhXvr2UBsIYGljBLrTzh2MXIB2TOYJCadus7cxcjBwSZgILHvni1IjYiAhcSd V/9ZQWqYBV4wStxb+pYFJCEsEC7x9GYbM4jNIqAqcbHtDyOIzSvgLnH6w2OwORICChJzJtmA hDkFPCSOL9nKCLHXXeL4/K+MExh5FzAyrGIUTS1NLihOSs811CtOzC0uzUvXS87P3cQICbUv OxgXH7M6xCjAwajEw7tD6HKQEGtiWXFl7iFGCQ5mJRHewkNAId6UxMqq1KL8+KLSnNTiQ4xM HJxSDYwi0y9fMU51DVWx2vFn3nLZD1u3/XW66T4nY5rdslV3NpSEf/nw9X9b/4wtn+4rtGhe vq/objVrUfTMVSp+XL+ZxOcHpm4OE/p+PMWeOzPgQAqLemXUGV5/YZbFLwLbNe2v8GfFfl34 dOMxb8d7Bu+XWhpt7dM7926OrdWdtqqW6Mtzkj74Sb1RYinOSDTUYi4qTgQA/iBwmBMCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anton Vorontsov Two new functions: jiffies_to_ktime() and ktime_to_jiffies(), we'll use them for timerfd deferred timers handling. We fully reuse the logic from timespec implementations, so the functions are pretty straightforward. The only tricky part is in headers: we have to include jiffies.h after we defined ktime_t, this is because ktime.h needs some declarations from jiffies.h (e.g. TICK_NSEC). Signed-off-by: Anton Vorontsov Signed-off-by: Alexey Perevalov --- include/linux/jiffies.h | 4 +++- include/linux/ktime.h | 3 ++- kernel/time.c | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index d235e88..1ba02ae 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -6,6 +6,7 @@ #include #include #include +#include #include /* for HZ */ /* @@ -302,7 +303,8 @@ extern void jiffies_to_timespec(const unsigned long jiffies, extern unsigned long timeval_to_jiffies(const struct timeval *value); extern void jiffies_to_timeval(const unsigned long jiffies, struct timeval *value); - +extern unsigned long ktime_to_jiffies(ktime_t *value); +extern void jiffies_to_ktime(const unsigned long jiffies, ktime_t *value); extern clock_t jiffies_to_clock_t(unsigned long x); static inline clock_t jiffies_delta_to_clock_t(long delta) { diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 31c0cd1..e8ed619 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -22,7 +22,6 @@ #define _LINUX_KTIME_H #include -#include /* * ktime_t: @@ -58,6 +57,8 @@ union ktime { typedef union ktime ktime_t; /* Kill this */ +#include + /* * ktime_t definitions when using the 64-bit scalar representation: */ diff --git a/kernel/time.c b/kernel/time.c index 7c7964c..22580a0 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -575,6 +576,28 @@ void jiffies_to_timeval(const unsigned long jiffies, struct timeval *value) } EXPORT_SYMBOL(jiffies_to_timeval); +unsigned long ktime_to_jiffies(ktime_t *value) +{ + struct timespec ts = ktime_to_timespec(*value); + + /* + * nsecs_to_jiffies(ktime_to_ns(*ktime)) is unsafe as nsecs_to_jiffies + * doesn't handle MAX_JIFFY_OFFSET. So we reuse the logic from the + * timespec to jiffies conversion function. + */ + return timespec_to_jiffies(&ts); +} +EXPORT_SYMBOL(ktime_to_jiffies); + +void jiffies_to_ktime(const unsigned long jiffies, ktime_t *value) +{ + struct timespec ts; + + jiffies_to_timespec(jiffies, &ts); + *value = timespec_to_ktime(ts); +} +EXPORT_SYMBOL(jiffies_to_ktime); + /* * Convert jiffies/jiffies_64 to clock_t and back. */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/