diff options
author | Brian Behlendorf <[email protected]> | 2022-05-31 16:30:59 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2022-06-01 09:59:15 -0700 |
commit | 4c6526208db0d3d5abf44664e74d1e28156a3db7 (patch) | |
tree | 5b2fb307542ae31c8f3fbd92d54ece873ec22331 /config/kernel-fpu.m4 | |
parent | 42cf2ad0e4e2adfa232f42e4254693467a4cc08c (diff) |
Linux 5.19 compat: asm/fpu/internal.h
As of the Linux 5.19 kernel the asm/fpu/internal.h header was
entirely removed. It has been effectively empty since the 5.16
kernel and provides no required functionality.
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Attila Fülöp <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #13529
Diffstat (limited to 'config/kernel-fpu.m4')
-rw-r--r-- | config/kernel-fpu.m4 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4 index eb9520c60..c6efebd8c 100644 --- a/config/kernel-fpu.m4 +++ b/config/kernel-fpu.m4 @@ -2,6 +2,9 @@ dnl # dnl # Handle differences in kernel FPU code. dnl # dnl # Kernel +dnl # 5.19: The asm/fpu/internal.h header was removed, it has been +dnl # effectively empty since the 5.16 kernel. +dnl # dnl # 5.11: kernel_fpu_begin() is an inlined function now, so don't check dnl # for it inside the kernel symbols. dnl # @@ -27,10 +30,22 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU_HEADER], [ ],[ AC_DEFINE(HAVE_KERNEL_FPU_API_HEADER, 1, [kernel has asm/fpu/api.h]) - AC_MSG_RESULT(asm/fpu/api.h) + + ZFS_LINUX_TRY_COMPILE([ + #include <linux/module.h> + #include <asm/fpu/internal.h> + ],[ + ],[ + AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL_HEADER, 1, + [kernel has asm/fpu/internal.h]) + AC_MSG_RESULT([asm/fpu/api.h asm/fpu/internal.h]) + ],[ + AC_MSG_RESULT([asm/fpu/api.h]) + ]) ],[ - AC_MSG_RESULT(i387.h) + AC_MSG_RESULT([i387.h]) ]) + ]) AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [ @@ -38,7 +53,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [ #include <linux/types.h> #ifdef HAVE_KERNEL_FPU_API_HEADER #include <asm/fpu/api.h> + #ifdef HAVE_KERNEL_FPU_INTERNAL_HEADER #include <asm/fpu/internal.h> + #endif #else #include <asm/i387.h> #endif @@ -51,7 +68,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [ #include <linux/types.h> #ifdef HAVE_KERNEL_FPU_API_HEADER #include <asm/fpu/api.h> + #ifdef HAVE_KERNEL_FPU_INTERNAL_HEADER #include <asm/fpu/internal.h> + #endif #else #include <asm/i387.h> #endif |