[dpdk-stable] patch 'kernel/freebsd: fix module build on latest head' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c63ac1bab51842676c65655f8c269c099851ebe1

Thanks.

Kevin Traynor

---
>From c63ac1bab51842676c65655f8c269c099851ebe1 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 6 Jun 2019 16:40:16 +0100
Subject: [PATCH] kernel/freebsd: fix module build on latest head

[ upstream commit 1c7191e7349e612a44523cde7fa2340ffe8f1c8f ]

Internal changes in the freebsd kernel have meant that additional includes
are now necessary to build the kernel modules for DPDK. Tested with latest
bsd HEAD revision.

Bugzilla ID: 282

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 kernel/freebsd/contigmem/contigmem.c | 3 +++
 kernel/freebsd/nic_uio/nic_uio.c     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/kernel/freebsd/contigmem/contigmem.c b/kernel/freebsd/contigmem/contigmem.c
index 1715b5dc5..64e0a7fec 100644
--- a/kernel/freebsd/contigmem/contigmem.c
+++ b/kernel/freebsd/contigmem/contigmem.c
@@ -14,8 +14,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/proc.h>
+#include <sys/lock.h>
 #include <sys/rwlock.h>
+#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
+#include <sys/eventhandler.h>
 
 #include <machine/bus.h>
diff --git a/kernel/freebsd/nic_uio/nic_uio.c b/kernel/freebsd/nic_uio/nic_uio.c
index 401b487e1..7a81694c9 100644
--- a/kernel/freebsd/nic_uio/nic_uio.c
+++ b/kernel/freebsd/nic_uio/nic_uio.c
@@ -12,4 +12,5 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/rwlock.h>
 #include <sys/proc.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.811769907 +0100
+++ 0005-kernel-freebsd-fix-module-build-on-latest-head.patch	2019-08-22 19:38:20.396027857 +0100
@@ -1 +1 @@
-From 1c7191e7349e612a44523cde7fa2340ffe8f1c8f Mon Sep 17 00:00:00 2001
+From c63ac1bab51842676c65655f8c269c099851ebe1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c7191e7349e612a44523cde7fa2340ffe8f1c8f ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org