* [PATCH] timers: local_clock() is defined in linux/sched.h in kernel below v4.11
@ 2019-06-13 9:40 René van Dorst
2019-06-13 9:42 ` Jason A. Donenfeld
0 siblings, 1 reply; 2+ messages in thread
From: René van Dorst @ 2019-06-13 9:40 UTC (permalink / raw)
To: Jason; +Cc: wireguard
Fixes: 7a79457255d5 ("global: switch to local_clock()")
Signed-off-by: René van Dorst <opensource@vdorst.com>
---
src/timers.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/timers.h b/src/timers.h
index ef1205690915..3af326056f3d 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -6,7 +6,11 @@
#ifndef _WG_TIMERS_H
#define _WG_TIMERS_H
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+#include <linux/sched.h>
+#else
#include <linux/sched/clock.h>
+#endif
struct wg_peer;
--
2.20.1
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] timers: local_clock() is defined in linux/sched.h in kernel below v4.11
2019-06-13 9:40 [PATCH] timers: local_clock() is defined in linux/sched.h in kernel below v4.11 René van Dorst
@ 2019-06-13 9:42 ` Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2019-06-13 9:42 UTC (permalink / raw)
To: René van Dorst; +Cc: WireGuard mailing list
Hey Rene,
Thanks for this. I may merge this today, but I might revert the
local_clock commit all together and replace it with something
different, based on some in-progress discussions on LKML. I'll let you
know.
Jason
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-13 9:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-13 9:40 [PATCH] timers: local_clock() is defined in linux/sched.h in kernel below v4.11 René van Dorst
2019-06-13 9:42 ` Jason A. Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).