diff options
| author | Coleman Kane <[email protected]> | 2022-10-18 15:29:44 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-18 12:29:44 -0700 |
| commit | ecb6a50819448cd2d6570298a5ba46b45eded216 (patch) | |
| tree | 555dfc6869863668a1d8df53ae33b2a666495bad /module/os | |
| parent | d10bd7d288eb44bbdef686a0255271a174200701 (diff) | |
Linux 6.1 compat: change order of sys/mutex.h includes
After Linux 6.1-rc1 came out, the build started failing to build a
couple of the files in the linux spl code due to the mutex_init
redefinition. Moving the sys/mutex.h include to a lower position within
these two files appears to fix the problem.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #14040
Diffstat (limited to 'module/os')
| -rw-r--r-- | module/os/linux/spl/spl-procfs-list.c | 2 | ||||
| -rw-r--r-- | module/os/linux/spl/spl-zone.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/module/os/linux/spl/spl-procfs-list.c b/module/os/linux/spl/spl-procfs-list.c index a4a24dcae..5e073950d 100644 --- a/module/os/linux/spl/spl-procfs-list.c +++ b/module/os/linux/spl/spl-procfs-list.c @@ -23,9 +23,9 @@ */ #include <sys/list.h> -#include <sys/mutex.h> #include <sys/procfs_list.h> #include <linux/proc_fs.h> +#include <sys/mutex.h> /* * A procfs_list is a wrapper around a linked list which implements the seq_file diff --git a/module/os/linux/spl/spl-zone.c b/module/os/linux/spl/spl-zone.c index 9421f81bf..b489179f1 100644 --- a/module/os/linux/spl/spl-zone.c +++ b/module/os/linux/spl/spl-zone.c @@ -25,7 +25,6 @@ */ #include <sys/types.h> -#include <sys/mutex.h> #include <sys/sysmacros.h> #include <sys/kmem.h> #include <linux/file.h> @@ -37,6 +36,8 @@ #include <linux/proc_ns.h> #endif +#include <sys/mutex.h> + static kmutex_t zone_datasets_lock; static struct list_head zone_datasets; |