Merge r7433 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7686 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:16:17 +00:00
parent d7ce14fb30
commit 172c95b25b

View File

@@ -715,14 +715,14 @@ struct t10_pi_tuple {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
#define timer_setup(_timer, _fn, _flags) do { \
init_timer(_timer); \
(_timer)->function = (void (*)(unsigned long))(_fn); \
(_timer)->function = (void *)(_fn); \
(_timer)->data = (unsigned long)(_timer); \
WARN_ON_ONCE((_flags) != 0); \
} while (0)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
#define timer_setup(_timer, _fn, _flags) do { \
init_timer(_timer); \
(_timer)->function = (void (*)(unsigned long))(_fn); \
(_timer)->function = (void *)(_fn);\
(_timer)->data = (unsigned long)(_timer); \
(_timer)->flags = (_flags); \
} while (0)