* [PATCH] backports: provide backport for ktime_get_seconds()
@ 2015-10-16 7:34 Arend van Spriel
2015-10-17 20:46 ` Arend van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Arend van Spriel @ 2015-10-16 7:34 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports, Arend van Spriel
Since commit 84b00607aeb8 ("mac80211: use ktime_get_seconds")
mac80211 uses ktime_get_seconds(). This patch provide a backport
using ktime_get_ts() for it.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
backport/backport-include/linux/ktime.h | 8 ++++++++
backport/compat/backport-4.3.c | 10 ++++++++++
2 files changed, 18 insertions(+)
diff --git a/backport/backport-include/linux/ktime.h b/backport/backport-include/linux/ktime.h
index 6fbc6c6..2edacf9 100644
--- a/backport/backport-include/linux/ktime.h
+++ b/backport/backport-include/linux/ktime.h
@@ -9,6 +9,14 @@ extern ktime_t ktime_get_raw(void);
#endif /* < 3.17 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+typedef __s64 time64_t;
+#endif
+#define ktime_get_seconds LINUX_BACKPORT(ktime_get_seconds)
+extern time64_t ktime_get_seconds(void);
+#endif /* < 3.19 */
+
#ifndef ktime_to_timespec64
/* Map the ktime_t to timespec conversion to ns_to_timespec function */
#define ktime_to_timespec64(kt) ns_to_timespec64((kt).tv64)
diff --git a/backport/compat/backport-4.3.c b/backport/compat/backport-4.3.c
index d15c92c..2797944 100644
--- a/backport/compat/backport-4.3.c
+++ b/backport/compat/backport-4.3.c
@@ -11,6 +11,7 @@
#include <linux/seq_file.h>
#include <linux/export.h>
#include <linux/printk.h>
+#include <linux/ktime.h>
static void seq_set_overflow(struct seq_file *m)
{
@@ -57,3 +58,12 @@ void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
}
}
EXPORT_SYMBOL_GPL(seq_hex_dump);
+
+time64_t ktime_get_seconds(void)
+{
+ struct timespec ts;
+
+ ktime_get_ts(&ts);
+ return ts.tv_sec;
+}
+EXPORT_SYMBOL_GPL(ktime_get_seconds);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] backports: provide backport for ktime_get_seconds()
2015-10-16 7:34 [PATCH] backports: provide backport for ktime_get_seconds() Arend van Spriel
@ 2015-10-17 20:46 ` Arend van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend van Spriel @ 2015-10-17 20:46 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports
On 10/16/2015 09:34 AM, Arend van Spriel wrote:
> Since commit 84b00607aeb8 ("mac80211: use ktime_get_seconds")
> mac80211 uses ktime_get_seconds(). This patch provide a backport
> using ktime_get_ts() for it.
That commit probably is for 4.4 kernel so guess it needs to be in a
newly created backport-4.4.c, right?
Regards,
Arend
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> backport/backport-include/linux/ktime.h | 8 ++++++++
> backport/compat/backport-4.3.c | 10 ++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/backport/backport-include/linux/ktime.h b/backport/backport-include/linux/ktime.h
> index 6fbc6c6..2edacf9 100644
> --- a/backport/backport-include/linux/ktime.h
> +++ b/backport/backport-include/linux/ktime.h
> @@ -9,6 +9,14 @@ extern ktime_t ktime_get_raw(void);
>
> #endif /* < 3.17 */
>
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
> +typedef __s64 time64_t;
> +#endif
> +#define ktime_get_seconds LINUX_BACKPORT(ktime_get_seconds)
> +extern time64_t ktime_get_seconds(void);
> +#endif /* < 3.19 */
> +
> #ifndef ktime_to_timespec64
> /* Map the ktime_t to timespec conversion to ns_to_timespec function */
> #define ktime_to_timespec64(kt) ns_to_timespec64((kt).tv64)
> diff --git a/backport/compat/backport-4.3.c b/backport/compat/backport-4.3.c
> index d15c92c..2797944 100644
> --- a/backport/compat/backport-4.3.c
> +++ b/backport/compat/backport-4.3.c
> @@ -11,6 +11,7 @@
> #include <linux/seq_file.h>
> #include <linux/export.h>
> #include <linux/printk.h>
> +#include <linux/ktime.h>
>
> static void seq_set_overflow(struct seq_file *m)
> {
> @@ -57,3 +58,12 @@ void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
> }
> }
> EXPORT_SYMBOL_GPL(seq_hex_dump);
> +
> +time64_t ktime_get_seconds(void)
> +{
> + struct timespec ts;
> +
> + ktime_get_ts(&ts);
> + return ts.tv_sec;
> +}
> +EXPORT_SYMBOL_GPL(ktime_get_seconds);
>
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-17 20:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-16 7:34 [PATCH] backports: provide backport for ktime_get_seconds() Arend van Spriel
2015-10-17 20:46 ` Arend van Spriel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.