git: 81174329b65e - stable/13 - netlink: Fix build without VIMAGE

The branch stable/13 has been updated by melifaro:

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

commit 81174329b65e4a8ddc5ab9702b5dcd86fff460c5
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2022-10-02 01:38:55 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2023-01-23 22:04:02 +0000

    netlink: Fix build without VIMAGE
    
    (cherry picked from commit fc083c3eb2bf9c2ea92914fab9e8fd090d1db710)
---
 sys/netlink/netlink_domain.c  | 1 +
 sys/netlink/netlink_generic.c | 5 ++++-
 sys/netlink/netlink_io.c      | 5 +++--
 sys/netlink/netlink_module.c  | 1 +
 sys/netlink/netlink_route.c   | 3 ++-
 sys/netlink/route/iface.c     | 2 ++
 sys/netlink/route/neigh.c     | 1 +
 sys/netlink/route/nexthop.c   | 3 ++-
 8 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
index 936a5438fa4a..bca30bedce11 100644
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -31,6 +31,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/rmlock.h>
diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c
index d422416cd9b4..64985f656a63 100644
--- a/sys/netlink/netlink_generic.c
+++ b/sys/netlink/netlink_generic.c
@@ -28,10 +28,13 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #include <sys/types.h>
+#include <sys/ck.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/socket.h>
-#include <sys/ck.h>
+#include <sys/sx.h>
 
 #include <netlink/netlink.h>
 #include <netlink/netlink_ctl.h>
diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c
index 5a0f195ed382..b2a0023a143b 100644
--- a/sys/netlink/netlink_io.c
+++ b/sys/netlink/netlink_io.c
@@ -29,10 +29,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/ck.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/ck.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c
index a1bcb8a29511..a433022b82b7 100644
--- a/sys/netlink/netlink_module.c
+++ b/sys/netlink/netlink_module.c
@@ -29,6 +29,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 
diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c
index f12bf268e252..5fdd1283e4ad 100644
--- a/sys/netlink/netlink_route.c
+++ b/sys/netlink/netlink_route.c
@@ -28,9 +28,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #include <sys/types.h>
+#include <sys/ck.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
-#include <sys/ck.h>
 
 #include <net/route.h>
 #include <net/route/route_ctl.h>
diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c
index 8db24b5507e4..8bb4406ad8be 100644
--- a/sys/netlink/route/iface.c
+++ b/sys/netlink/route/iface.c
@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include <sys/types.h>
+#include <sys/eventhandler.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c
index 02ad138240a2..73844398d26d 100644
--- a/sys/netlink/route/neigh.c
+++ b/sys/netlink/route/neigh.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include <sys/types.h>
+#include <sys/eventhandler.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c
index 92555aa8b123..77be3a612641 100644
--- a/sys/netlink/route/nexthop.c
+++ b/sys/netlink/route/nexthop.c
@@ -30,10 +30,11 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include <sys/types.h>
+#include <sys/ck.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/rmlock.h>
 #include <sys/socket.h>
-#include <sys/ck.h>
 
 #include <net/if.h>
 #include <net/route.h>