diff options
| author | Rafael Kitover <[email protected]> | 2019-05-23 14:40:28 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-05-23 14:40:28 -0700 |
| commit | 8b8b44d06fc653ca608412a756d3645ee465f7fe (patch) | |
| tree | 15b0c0ac0f59295ac1a37c9ed9b18936d39c5ec5 /config/kernel.m4 | |
| parent | 78fac8d925fdd64584292fbda4ed9e3e2bbaae66 (diff) | |
kernel timer API rework
In `config/kernel-timer.m4` refactor slightly to check more generally
for the new `timer_setup()` APIs, but also check the callback signature
because some kernels (notably 4.14) have the new `timer_setup()` API but
use the old callback signature. Also add a check for a `flags` member in
`struct timer_list`, which was added in 4.1-rc8.
Add compatibility shims to `include/spl/sys/timer.h` to allow using the
new timer APIs with the only two caveats being that the callback
argument type must be declared as `spl_timer_list_t` and an explicit
assignment is required to get the timer variable for the `timer_of()`
macro. So the callback would look like this:
```c
__cv_wakeup(spl_timer_list_t t)
{
struct timer_list *tmr = (struct timer_list *)t;
struct thing *parent = from_timer(parent, tmr,
parent_timer_field);
... /* do stuff with parent */
```
Make some minor changes to `spl-condvar.c` and `spl-taskq.c` to use the
new timer APIs instead of conditional code.
Reviewed-by: Tomohiro Kusumi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rafael Kitover <[email protected]>
Closes #8647
Diffstat (limited to 'config/kernel.m4')
| -rw-r--r-- | config/kernel.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index 026a5258f..54f39164b 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -37,7 +37,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_GROUP_INFO_GID ZFS_AC_KERNEL_WRITE ZFS_AC_KERNEL_READ - ZFS_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST + ZFS_AC_KERNEL_TIMER_SETUP ZFS_AC_KERNEL_DECLARE_EVENT_CLASS ZFS_AC_KERNEL_CURRENT_BIO_TAIL ZFS_AC_KERNEL_SUPER_USER_NS |