Skip to content

Commit

Permalink
config: remove HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST
Browse files Browse the repository at this point in the history
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes openzfs#16479
  • Loading branch information
robn authored and behlendorf committed Sep 18, 2024
1 parent a5b3a87 commit 940f5d5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
17 changes: 0 additions & 17 deletions config/kernel-timer.m4
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TIMER_SETUP], [
struct my_task_timer task_timer;
timer_setup(&task_timer.timer, task_expire, 0);
])
ZFS_LINUX_TEST_SRC([timer_list_function], [
#include <linux/timer.h>
static void task_expire(struct timer_list *tl) {}
],[
struct timer_list tl;
tl.function = task_expire;
])
])

AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
Expand All @@ -47,13 +39,4 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
],[
AC_MSG_RESULT(no)
])
AC_MSG_CHECKING([whether timer function expects timer_list])
ZFS_LINUX_TEST_RESULT([timer_list_function], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST, 1,
[timer_list.function gets a timer_list])
],[
AC_MSG_RESULT(no)
])
])
4 changes: 0 additions & 4 deletions include/os/linux/spl/sys/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@
container_of(timer, typeof(*var), timer_field)
#endif

#ifdef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST
typedef struct timer_list *spl_timer_list_t;
#else
typedef unsigned long spl_timer_list_t;
#endif

#ifndef HAVE_KERNEL_TIMER_SETUP

Expand Down

0 comments on commit 940f5d5

Please sign in to comment.