diff options
| author | Ryan Moeller <[email protected]> | 2020-10-02 20:48:45 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-02 17:48:45 -0700 |
| commit | 79f0935fab1122d466f67885e84d878c107e34df (patch) | |
| tree | a4c96812a745dc9d4766a3c5f2cd79e255cd318a | |
| parent | a132c2b413de78981cd958974ad95d3f9cec9dea (diff) | |
FreeBSD: Sort out kernel FPU headers for 12.1-REL
We were missing an include for kernel FPU functions, breaking the build
on FreeBSD 12.1-RELEASE. This was apparently being pulled in from
elsewhere on stable/12 and head.
Sorted the other includes in these files while here.
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #11005
| -rw-r--r-- | include/os/freebsd/spl/sys/simd_x86.h | 11 | ||||
| -rw-r--r-- | module/os/freebsd/spl/spl_taskq.c | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/os/freebsd/spl/sys/simd_x86.h b/include/os/freebsd/spl/sys/simd_x86.h index 63d6017b7..480bfd289 100644 --- a/include/os/freebsd/spl/sys/simd_x86.h +++ b/include/os/freebsd/spl/sys/simd_x86.h @@ -26,15 +26,12 @@ * $FreeBSD$ */ -#include <sys/cdefs.h> #include <sys/types.h> -#include <sys/systm.h> +#include <sys/cdefs.h> #include <sys/proc.h> -#ifdef __i386__ -#include <x86/fpu.h> -#else -#include <machine/fpu.h> -#endif +#include <sys/systm.h> + +#include <machine/pcb.h> #include <x86/x86_var.h> #include <x86/specialreg.h> diff --git a/module/os/freebsd/spl/spl_taskq.c b/module/os/freebsd/spl/spl_taskq.c index cc025de95..b9e1fb52b 100644 --- a/module/os/freebsd/spl/spl_taskq.c +++ b/module/os/freebsd/spl/spl_taskq.c @@ -29,18 +29,21 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> #include <sys/param.h> +#include <sys/ck.h> +#include <sys/epoch.h> #include <sys/kernel.h> #include <sys/kmem.h> #include <sys/lock.h> #include <sys/mutex.h> #include <sys/queue.h> -#include <sys/taskqueue.h> #include <sys/taskq.h> +#include <sys/taskqueue.h> #include <sys/zfs_context.h> -#include <sys/ck.h> -#include <sys/epoch.h> + +#if defined(__i386__) || defined(__amd64__) || defined(__aarch64__) +#include <machine/pcb.h> +#endif #include <vm/uma.h> |