diff options
Diffstat (limited to 'config/kernel-timer.m4')
| -rw-r--r-- | config/kernel-timer.m4 | 63 |
1 files changed, 52 insertions, 11 deletions
diff --git a/config/kernel-timer.m4 b/config/kernel-timer.m4 index 4dc3f84ed..b0e1afa15 100644 --- a/config/kernel-timer.m4 +++ b/config/kernel-timer.m4 @@ -1,26 +1,51 @@ +dnl # 4.14-rc3 API change +dnl # https://lwn.net/Articles/735887/ dnl # -dnl # 4.15 API change -dnl # https://lkml.org/lkml/2017/11/25/90 dnl # Check if timer_list.func get passed a timer_list or an unsigned long dnl # (older kernels). Also sanity check the from_timer() and timer_setup() dnl # macros are available as well, since they will be used in the same newer dnl # kernels that support the new timer_list.func signature. dnl # -AC_DEFUN([ZFS_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST], [ - AC_MSG_CHECKING([whether timer_list.function gets a timer_list]) +dnl # Also check for the existance of flags in struct timer_list, they were +dnl # added in 4.1-rc8 via 0eeda71bc30d. + +AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [ + AC_MSG_CHECKING([whether timer_setup() is available]) tmp_flags="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="-Werror" + ZFS_LINUX_TRY_COMPILE([ #include <linux/timer.h> - void task_expire(struct timer_list *tl) {} + + struct my_task_timer { + struct timer_list timer; + int data; + }; + + void task_expire(struct timer_list *tl) + { + struct my_task_timer *task_timer = from_timer(task_timer, tl, timer); + task_timer->data = 42; + } + ],[ + struct my_task_timer task_timer; + timer_setup(&task_timer.timer, task_expire, 0); ],[ - #ifndef from_timer - #error "No from_timer() macro" - #endif + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KERNEL_TIMER_SETUP, 1, + [timer_setup() is available]) + ],[ + AC_MSG_RESULT(no) + ]) - struct timer_list timer; - timer.function = task_expire; - timer_setup(&timer, NULL, 0); + AC_MSG_CHECKING([whether timer function expects timer_list]) + + ZFS_LINUX_TRY_COMPILE([ + #include <linux/timer.h> + void task_expire(struct timer_list *tl) {} + ],[ + struct timer_list tl; + tl.function = task_expire; ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST, 1, @@ -28,5 +53,21 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST], [ ],[ AC_MSG_RESULT(no) ]) + + AC_MSG_CHECKING([whether struct timer_list has flags]) + + ZFS_LINUX_TRY_COMPILE([ + #include <linux/timer.h> + ],[ + struct timer_list tl; + tl.flags = 2; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KERNEL_TIMER_LIST_FLAGS, 1, + [struct timer_list has a flags member]) + ],[ + AC_MSG_RESULT(no) + ]) + EXTRA_KCFLAGS="$tmp_flags" ]) |