Re: git: c20d12958d45 - stable/15 - x86: remove sys/mount.h from genassym.c

On Mon, Jun 22, 2026 at 05:53:07PM +0200, Harry Schmalzbauer wrote:
> On 2026-06-21 12:16, Konstantin Belousov wrote:
> > The branch stable/15 has been updated by kib:
> > 
> > URL: https://cgit.FreeBSD.org/src/commit/?id=c20d12958d45b8a01b9d3dd99b85a195183190ec
> > 
> > commit c20d12958d45b8a01b9d3dd99b85a195183190ec
> > Author:     Konstantin Belousov <kib@FreeBSD.org>
> > AuthorDate: 2026-05-16 19:27:40 +0000
> > Commit:     Konstantin Belousov <kib@FreeBSD.org>
> > CommitDate: 2026-06-21 10:05:30 +0000
> > 
> >      x86: remove sys/mount.h from genassym.c
> >      (cherry picked from commit 72ab129799a231e322b119de3f9c1263e76527b8)
> 
> 
> Hello,
> 
> without reverting this commit I can't compile my custom kernel (i386):
> 
> cc -target i386-unknown-freebsd15.1.0
> --sysroot=/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/tmp
> -B/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/tmp/usr/bin -c
> -O2 -pipe -fno-strict-aliasing -march=haswell -g -nostdinc -I.
> -I/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys
> -I/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/contrib/ck/include
> -I/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/contrib/libfdt
> -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -MD
> -MF.depend.genassym.o -MTgenassym.o -ffile-prefix-map=/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys=/usr/src/sys -ffile-prefix-map=/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/sys/BHYVE-TELESTO=/usr/obj/usr/src/i386.i386/sys/BHYVE-telesto -ffile-prefix-map=/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/tmp=/sysroot
> -fdebug-prefix-map=./machine=/usr/src/sys/i386/include
> -fdebug-prefix-map=./x86=/usr/src/sys/x86/include -mno-mmx -mno-sse
> -msoft-float -ffreestanding -fwrapv -fstack-protector-strong -gdwarf-4 -Wall
> -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef
> -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs
> -fdiagnostics-show-option -Wno-unknown-pragmas -Wswitch
> -Wno-error=tautological-compare -Wno-error=empty-body
> -Wno-error=parentheses-equality -Wno-error=unused-function
> -Wno-error=pointer-sign -Wno-error=shift-negative-value
> -Wno-address-of-packed-member -Wno-format-zero-length -mno-aes -mno-avx
> -std=gnu17  -fcommon
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c
> In file included from
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c:63:
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfs/nfsproto.h:375:2:
> error: unknown type name 'fhandle_t'
>   375 |         fhandle_t       fh_generic;
>       |         ^
> In file included from
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c:64:
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfsclient/nfs.h:239:1:
> error: unknown type name 'vfs_init_t'
>   239 | vfs_init_t nfs_init;
>       | ^
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfsclient/nfs.h:240:1:
> error: unknown type name 'vfs_uninit_t'
>   240 | vfs_uninit_t nfs_uninit;
>       | ^
> In file included from
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c:65:
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfs/nfsdiskless.h:65:21:
> error: use of undeclared identifier 'MNAMELEN'
>    65 |         char            root_hostnam[MNAMELEN]; /* Host name for
> mount pt */
>       |                                      ^~~~~~~~
> /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfs/nfsdiskless.h:99:21:
> error: use of undeclared identifier 'MNAMELEN'
>    99 |         char            root_hostnam[MNAMELEN]; /* Host name for
> mount pt */
>       |                                      ^~~~~~~~
> 5 errors generated.
> *** [genassym.o] Error code 1
> 
> After reverting c20d12958d45b8a01b9d3dd99b85a195183190ec locally I can
> successfully build the custom kernel
> Haven't had time to see if this is i386 specific, which I doubt it is.  I
> guess it's related to my custom kernel config then...
> 
> Any hints apprectiated.
> 

Might be fixed by 17c391c6a2169f6a50644