From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER
Date: Sun, 4 Mar 2018 23:57:05 +0100 [thread overview]
Message-ID: <20180304225717.20890-3-hauke@hauke-m.de> (raw)
In-Reply-To: <20180304225717.20890-1-hauke@hauke-m.de>
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 --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 */
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2018-03-04 22:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 01/14] patches: refresh on kernel v4.16-rc3 Hauke Mehrtens
2018-03-04 22:57 ` Hauke Mehrtens [this message]
2018-03-04 22:57 ` [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Hauke Mehrtens
2018-03-21 7:59 ` Johannes Berg
2018-03-04 22:57 ` [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 05/14] header: types.h: add __poll_t Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 06/14] header: kernel.h: include bug.h Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 07/14] header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 08/14] header: nospec.h: provide dummy header file Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 09/14] header: timekeeping.h: Add ktime_get_real_seconds() Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 10/14] header: timekeeping.h: Add ktime_get_ts64() Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 11/14] header: netdevice.h: Fix netdev_upper_dev_link on 4.14 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 12/14] header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 13/14] dependencies: Make mt76 depend on kernel 4.1 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 14/14] backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver Hauke Mehrtens
2018-03-21 8:20 ` [PATCH 00/14] backports: multiple fixes and Realtek drivers Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180304225717.20890-3-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=backports@vger.kernel.org \
--cc=johannes@sipsolutions.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).