2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Netflix
> ---
>=C2=A0 =C2=A0sys/dev/nvme/nvme.h | 11 ++++-------
>=C2=A0 =C2=A01 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
> index 3de65a4a481f..ddbc149802f4 100644
> --- a/sys/dev/nvme/nvme.h
> +++ b/sys/dev/nvme/nvme.h
> @@ -29,15 +29,13 @@
>=C2=A0 =C2=A0#ifndef __NVME_H__
>=C2=A0 =C2=A0#define __NVME_H__
>=C2=A0 =C2=A0
> -#ifdef _KERNEL
> -#include <sys/types.h>
> -#endif
> -
>=C2=A0 =C2=A0#include <sys/param.h>
> -#include <sys/endian.h>
> -#ifndef _KERNEL
> +#ifdef _KERNEL
> +#include <sys/systm.h>
> +#else
>=C2=A0 =C2=A0#include <stdbool.h>
>=C2=A0 =C2=A0#endif
> +#include <sys/endian.h>
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0struct sbuf;
>=C2=A0 =C2=A0
> @@ -1909,7 +1907,6 @@ void=C2=A0 =C2=A0 nvme_sc_sbuf(const struct nvme=
_completion *cpl, struct sbuf *sbuf);
>=C2=A0 =C2=A0void=C2=A0 =C2=A0 =C2=A0 =C2=A0 nvme_strvis(uint8_t *dst, =
const uint8_t *src, int dstlen, int srclen);
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0#ifdef _KERNEL
> -#include <sys/systm.h>
>=C2=A0 =C2=A0#include <sys/disk.h>
I should perhaps just move this to the top as well so all the #include'=
s are in one place.
Done=C2=A0
--0000000000005e6a340644f1b078--