Date: Tue, 13 Oct 2020 17:26:13 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366672 - in head: share/man/man9 sys/crypto/aesni sys/crypto/blake2 sys/crypto/via sys/i386/include Message-ID: <202010131726.09DHQDTu015541@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Tue Oct 13 17:26:12 2020 New Revision: 366672 URL: https://svnweb.freebsd.org/changeset/base/366672 Log: Add a <machine/fpu.h> for i386 that includes <machine/npx.h>. arm64 has a similar wrapper. This permits defining <machine/fpu.h> as the standard header for fpu_kern_*. Reviewed by: kib Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D26753 Added: head/sys/i386/include/fpu.h (contents, props changed) Modified: head/share/man/man9/fpu_kern.9 head/sys/crypto/aesni/aesni.c head/sys/crypto/aesni/aesni.h head/sys/crypto/blake2/blake2_cryptodev.c head/sys/crypto/via/padlock.h Modified: head/share/man/man9/fpu_kern.9 ============================================================================== --- head/share/man/man9/fpu_kern.9 Tue Oct 13 17:14:30 2020 (r366671) +++ head/share/man/man9/fpu_kern.9 Tue Oct 13 17:26:12 2020 (r366672) @@ -23,13 +23,14 @@ .\" .\" $FreeBSD$ .\" -.Dd March 7, 2018 +.Dd October 13, 2020 .Dt FPU_KERN 9 .Os .Sh NAME .Nm fpu_kern .Nd "facility to use the FPU in the kernel" .Sh SYNOPSIS +.In machine/fpu.h .Ft struct fpu_kern_ctx * .Fn fpu_kern_alloc_ctx "u_int flags" .Ft void Modified: head/sys/crypto/aesni/aesni.c ============================================================================== --- head/sys/crypto/aesni/aesni.c Tue Oct 13 17:14:30 2020 (r366671) +++ head/sys/crypto/aesni/aesni.c Tue Oct 13 17:26:12 2020 (r366672) @@ -60,11 +60,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/specialreg.h> -#if defined(__i386__) -#include <machine/npx.h> -#elif defined(__amd64__) #include <machine/fpu.h> -#endif static struct mtx_padalign *ctx_mtx; static struct fpu_kern_ctx **ctx_fpu; Modified: head/sys/crypto/aesni/aesni.h ============================================================================== --- head/sys/crypto/aesni/aesni.h Tue Oct 13 17:14:30 2020 (r366671) +++ head/sys/crypto/aesni/aesni.h Tue Oct 13 17:26:12 2020 (r366672) @@ -40,10 +40,6 @@ #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/specialreg.h> -#endif -#if defined(__i386__) -#include <machine/npx.h> -#elif defined(__amd64__) #include <machine/fpu.h> #endif Modified: head/sys/crypto/blake2/blake2_cryptodev.c ============================================================================== --- head/sys/crypto/blake2/blake2_cryptodev.c Tue Oct 13 17:14:30 2020 (r366671) +++ head/sys/crypto/blake2/blake2_cryptodev.c Tue Oct 13 17:26:12 2020 (r366672) @@ -43,11 +43,7 @@ __FBSDID("$FreeBSD$"); #include <opencrypto/cryptodev.h> #include <cryptodev_if.h> -#if defined(__amd64__) #include <machine/fpu.h> -#elif defined(__i386__) -#include <machine/npx.h> -#endif struct blake2_session { size_t mlen; Modified: head/sys/crypto/via/padlock.h ============================================================================== --- head/sys/crypto/via/padlock.h Tue Oct 13 17:14:30 2020 (r366671) +++ head/sys/crypto/via/padlock.h Tue Oct 13 17:26:12 2020 (r366672) @@ -32,11 +32,7 @@ #include <opencrypto/cryptodev.h> #include <crypto/rijndael/rijndael.h> -#if defined(__i386__) -#include <machine/npx.h> -#elif defined(__amd64__) #include <machine/fpu.h> -#endif union padlock_cw { uint64_t raw; Added: head/sys/i386/include/fpu.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/i386/include/fpu.h Tue Oct 13 17:26:12 2020 (r366672) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + * + * $FreeBSD$ + */ +#include <machine/npx.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010131726.09DHQDTu015541>