Date: Fri, 6 Aug 2021 05:13:36 GMT From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f7c5c21f159f - stable/12 - fortuna: Deduplicate kernel vs user includes Message-ID: <202108060513.1765DaPx000976@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c5c21f159ffd535c251a0052b5e8a2bc3b5b67 commit f7c5c21f159ffd535c251a0052b5e8a2bc3b5b67 Author: Conrad Meyer <cem@FreeBSD.org> AuthorDate: 2019-03-01 22:51:45 +0000 Commit: David E. O'Brien <obrien@FreeBSD.org> CommitDate: 2021-08-06 05:12:21 +0000 fortuna: Deduplicate kernel vs user includes No functional change. Reviewed by: markj, markm Approved by: secteam (delphij), core (brooks) Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D19409 (cherry picked from commit e66ccbeaa3613d022dbc07b9f7403c6bfbe40be6) --- sys/dev/random/fortuna.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sys/dev/random/fortuna.c b/sys/dev/random/fortuna.c index 3a46d527fa9a..11879831dbbd 100644 --- a/sys/dev/random/fortuna.c +++ b/sys/dev/random/fortuna.c @@ -35,10 +35,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/param.h> #include <sys/limits.h> #ifdef _KERNEL -#include <sys/param.h> #include <sys/fail.h> #include <sys/kernel.h> #include <sys/lock.h> @@ -50,17 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/cpu.h> - -#include <crypto/rijndael/rijndael-api-fst.h> -#include <crypto/sha2/sha256.h> - -#include <dev/random/hash.h> -#include <dev/random/randomdev.h> -#include <dev/random/random_harvestq.h> -#include <dev/random/uint128.h> -#include <dev/random/fortuna.h> #else /* !_KERNEL */ -#include <sys/param.h> #include <inttypes.h> #include <stdbool.h> #include <stdio.h> @@ -69,15 +59,18 @@ __FBSDID("$FreeBSD$"); #include <threads.h> #include "unit_test.h" +#endif /* _KERNEL */ #include <crypto/rijndael/rijndael-api-fst.h> #include <crypto/sha2/sha256.h> #include <dev/random/hash.h> #include <dev/random/randomdev.h> +#ifdef _KERNEL +#include <dev/random/random_harvestq.h> +#endif #include <dev/random/uint128.h> #include <dev/random/fortuna.h> -#endif /* _KERNEL */ /* Defined in FS&K */ #define RANDOM_FORTUNA_NPOOLS 32 /* The number of accumulation pools */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108060513.1765DaPx000976>