Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Mar 2026 04:05:47 +0000
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: a47c870930a7 - main - inpcb: fix up !VIMAGE builds
Message-ID:  <69b4de9b.43cf6.575e45dc@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by glebius:

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

commit a47c870930a728b5d890e8243cc363c788ebddc7
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2026-03-14 03:59:51 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2026-03-14 03:59:51 +0000

    inpcb: fix up !VIMAGE builds
    
    There are some files that don't include mutex.h and rwlock.h, but use
    inpcb locking macros.  With VIMAGE the net/vnet.h pulls half of the
    possible kernel includes, masking the problem.  The in_pcb.h also used to
    mask the problem, so restore that.
    
    Fixes:  041e9eb1ae094a81e55fbcaba37eb2ac194658cc
---
 sys/netinet/in_pcb.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index bdf8ff9fb74c..6f842f64775e 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -292,9 +292,9 @@ struct xktls_session {
  */
 #include <sys/queue.h>
 #include <sys/epoch.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_rwlock.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/rwlock.h>
 #include <sys/_smr.h>
 #include <net/route.h>
 #include <sys/proc.h>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b4de9b.43cf6.575e45dc>