Skip to content

Commit 59d8f04

Browse files
committed
Linux 5.19 compat: asm/fpu/internal.h
As of the Linux 5.19 the asm/fpu/internal.h header is empty, it was therefore removed and there's no reason to include it. Signed-off-by: Brian Behlendorf <[email protected]>
1 parent bc8192c commit 59d8f04

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

config/kernel-fpu.m4

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,32 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU_HEADER], [
2727
],[
2828
AC_DEFINE(HAVE_KERNEL_FPU_API_HEADER, 1,
2929
[kernel has asm/fpu/api.h])
30-
AC_MSG_RESULT(asm/fpu/api.h)
30+
31+
ZFS_LINUX_TRY_COMPILE([
32+
#include <linux/module.h>
33+
#include <asm/fpu/internal.h>
34+
],[
35+
],[
36+
AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL_HEADER, 1,
37+
[kernel has asm/internal/api.h])
38+
AC_MSG_RESULT([asm/fpu/api.h asm/fpu/internal.h])
39+
],[
40+
AC_MSG_RESULT([asm/fpu/api.h])
41+
])
3142
],[
32-
AC_MSG_RESULT(i387.h)
43+
AC_MSG_RESULT([i387.h])
3344
])
45+
3446
])
3547

3648
AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
3749
ZFS_LINUX_TEST_SRC([kernel_fpu], [
3850
#include <linux/types.h>
3951
#ifdef HAVE_KERNEL_FPU_API_HEADER
4052
#include <asm/fpu/api.h>
53+
#ifdef HAVE_KERNEL_FPU_INTERNAL_HEADER
4154
#include <asm/fpu/internal.h>
55+
#endif
4256
#else
4357
#include <asm/i387.h>
4458
#endif
@@ -51,7 +65,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
5165
#include <linux/types.h>
5266
#ifdef HAVE_KERNEL_FPU_API_HEADER
5367
#include <asm/fpu/api.h>
68+
#ifdef HAVE_KERNEL_FPU_INTERNAL_HEADER
5469
#include <asm/fpu/internal.h>
70+
#endif
5571
#else
5672
#include <asm/i387.h>
5773
#endif

include/os/linux/kernel/linux/simd_x86.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393

9494
#if defined(HAVE_KERNEL_FPU_API_HEADER)
9595
#include <asm/fpu/api.h>
96+
#if defined(HAVE_KERNEL_FPU_INTERNAL_HEADER)
9697
#include <asm/fpu/internal.h>
98+
#endif
9799
#else
98100
#include <asm/i387.h>
99101
#endif

0 commit comments

Comments
 (0)