Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 03 May 2026 23:52:03 +0000
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Andrew Gallatin <gallatin@FreeBSD.org>
Subject:   git: f544b5d2092d - stable/15 - Fix nooptions VIMAGE build
Message-ID:  <69f7dfa3.26eff.1d14b7b1@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=f544b5d2092df764cdd34dfb20a18ad66e314d0c

commit f544b5d2092df764cdd34dfb20a18ad66e314d0c
Author:     Andrew Gallatin <gallatin@FreeBSD.org>
AuthorDate: 2026-04-04 23:10:45 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-05-03 23:10:43 +0000

    Fix nooptions VIMAGE build
    
    The recent FIBify commits deref struct thread without including
    sys/proc.h, which can result in a compiler error.  This becomes
    apparent when building with LINT-NOVIMAGE, as net/vnet.h includes
    sys/proc.h.  Fix this by directly including sys/proc.h
    
    Fixes: 4c486fe40267 ("ip_mroute: FIBify"), 0bb9c2b665d9 ("ip6_mroute: FIBify")
    
    (cherry picked from commit 3f79bc9ca336f634e1afa262ccf5155882550a8a)
---
 sys/netinet/ip_mroute.c   | 1 +
 sys/netinet6/ip6_mroute.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index c54631869b24..7e217525f750 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -86,6 +86,7 @@
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/priv.h>
+#include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index ed78e40ea60a..2cb1e65ca386 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -92,6 +92,7 @@
 #include <sys/module.h>
 #include <sys/domain.h>
 #include <sys/priv.h>
+#include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/sdt.h>
 #include <sys/signalvar.h>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f7dfa3.26eff.1d14b7b1>