Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 1 Dec 2025 09:53:44 -0500
From:      John Baldwin <jhb@FreeBSD.org>
To:        Warner Losh <imp@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   Re: git: 301b8a806f79 - main - nvme: Minor style(9) fixes
Message-ID:  <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org>
In-Reply-To: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org>
References:  <6925d6af.3b42c.336a0065@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail 

On 11/25/25 11:17, Warner Losh wrote:
> The branch main has been updated by imp:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=301b8a806f79292ee3324ca938a4d938df1911e8
> 
> commit 301b8a806f79292ee3324ca938a4d938df1911e8
> Author:     Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-11-25 16:10:23 +0000
> Commit:     Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-25 16:12:51 +0000
> 
>      nvme: Minor style(9) fixes
>      
>      <sys/systm.h> needs to be first after <sys/param.h>. And we don't need
>      both sys/param.h and sys/types.h.
>      
>      Fixes:          032fbda024d78
>      Sponsored by:   Netflix
> ---
>   sys/dev/nvme/nvme.h | 11 ++++-------
>   1 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 @@
>   #ifndef __NVME_H__
>   #define __NVME_H__
>   
> -#ifdef _KERNEL
> -#include <sys/types.h>
> -#endif
> -
>   #include <sys/param.h>
> -#include <sys/endian.h>
> -#ifndef _KERNEL
> +#ifdef _KERNEL
> +#include <sys/systm.h>
> +#else
>   #include <stdbool.h>
>   #endif
> +#include <sys/endian.h>
>   
>   struct sbuf;
>   
> @@ -1909,7 +1907,6 @@ void	nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf);
>   void	nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen);
>   
>   #ifdef _KERNEL
> -#include <sys/systm.h>
>   #include <sys/disk.h>

I should perhaps just move this to the top as well so all the #include's are in one place.

-- 
John Baldwin
help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6365e335-fcc8-4590-af40-230815012f9d>