diff mbox

[02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER

Message ID 20180304225717.20890-3-hauke@hauke-m.de (mailing list archive)
State Accepted
Headers show

Commit Message

Hauke Mehrtens March 4, 2018, 10:57 p.m. UTC
DEFINE_TIMER only has 2 parameters since kernel commit 1d27e3e2252ba
("timer: Remove expires and data arguments from DEFINE_TIMER") which was
added with kernel 4.15. Add a version which translates between the new
and the old API.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/timer.h | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox

Patch

diff --git a/backport/backport-include/linux/timer.h b/backport/backport-include/linux/timer.h
index 9824ea6b..69590bb7 100644
--- a/backport/backport-include/linux/timer.h
+++ b/backport/backport-include/linux/timer.h
@@ -60,4 +60,11 @@  static inline void timer_setup(struct timer_list *timer,
 	container_of(callback_timer, typeof(*var), timer_fieldname)
 #endif
 
+#if LINUX_VERSION_IS_LESS(4,15,0)
+#undef DEFINE_TIMER
+#define DEFINE_TIMER(_name, _function)				\
+	struct timer_list _name =				\
+		__TIMER_INITIALIZER(_function, 0, 0, 0)
+#endif
+
 #endif /* _BACKPORT_TIMER_H */