[Bug,282] Fix missing headers in FreeBSD CURRENT build

Message ID bug-282-3@http.bugs.dpdk.org/ (mailing list archive)
State Not Applicable, archived
Headers
Series [Bug,282] Fix missing headers in FreeBSD CURRENT build |

Checks

Context Check Description
ci/Intel-compilation fail apply issues

Commit Message

bugzilla@dpdk.org May 21, 2019, 1:54 a.m. UTC
  https://bugs.dpdk.org/show_bug.cgi?id=282

            Bug ID: 282
           Summary: Fix missing headers in FreeBSD CURRENT build
           Product: DPDK
           Version: 18.05
          Hardware: All
                OS: FreeBSD
            Status: CONFIRMED
          Severity: normal
          Priority: Normal
         Component: core
          Assignee: dev@dpdk.org
          Reporter: cem@FreeBSD.org
  Target Milestone: ---

After header pollution cleanup, some files in DPDK 18.05.1 no longer compile. 
The fixes are straightforward.  I don't know if the problem is still present in
newer DPDK but I wouldn't be surprised if it were.  Feel free to consider these
patches in the public domain, or CC0 if you're European:
  

Comments

Stephen Hemminger May 21, 2019, 3:04 a.m. UTC | #1
On Tue, 21 May 2019 01:54:36 +0000
bugzilla@dpdk.org wrote:

> https://bugs.dpdk.org/show_bug.cgi?id=282
> 
>             Bug ID: 282
>            Summary: Fix missing headers in FreeBSD CURRENT build
>            Product: DPDK
>            Version: 18.05
>           Hardware: All
>                 OS: FreeBSD
>             Status: CONFIRMED
>           Severity: normal
>           Priority: Normal
>          Component: core
>           Assignee: dev@dpdk.org
>           Reporter: cem@FreeBSD.org
>   Target Milestone: ---
> 
> After header pollution cleanup, some files in DPDK 18.05.1 no longer compile. 
> The fixes are straightforward.  I don't know if the problem is still present in
> newer DPDK but I wouldn't be surprised if it were.  Feel free to consider these
> patches in the public domain, or CC0 if you're European:
> 

All patches must be licensed by the same license as the original code.
That is BSD-3 in this case.

Please don't send with other licenses.
  
bugzilla@dpdk.org July 12, 2019, 4:07 p.m. UTC | #2
https://bugs.dpdk.org/show_bug.cgi?id=282

Conrad Meyer (cem@FreeBSD.org) changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|CONFIRMED                   |RESOLVED

--- Comment #6 from Conrad Meyer (cem@FreeBSD.org) ---
(In reply to Herakliusz from comment #5)
> This issue had been fixed
> on 19.08. As I said before 18.05 is no longer supported so there will be no
> back-port to 18.05 but more than likely this will get back-ported to 18.11
> LTS as well.

Right, 1c7191e7349e612a44523cde7fa2340ffe8f1c8f works for me.  I just want it
fixed in the development branch; I don't care about 18.05 or any LTS release in
particular.  Thanks Bruce Richardson!
  

Patch

--- kernel/freebsd/contigmem/contigmem.c.orig   2018-09-05 14:29:02 UTC
+++ kernel/freebsd/contigmem/contigmem.c
@@ -9,9 +9,12 @@ 
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/systm.h>

--- kernel/freebsd/nic_uio/nic_uio.c.orig       2018-09-05 14:29:02 UTC
+++ kernel/freebsd/nic_uio/nic_uio.c
@@ -9,6 +9,7 @@ 
 #include <sys/kernel.h> /* types used in module initialization */
 #include <sys/conf.h> /* cdevsw struct */
 #include <sys/bus.h> /* structs, prototypes for pci bus stuff and DEVMETHOD */
+#include <sys/lock.h> /* used by vm_pager.h => MPASS() */
 #include <sys/rman.h>
 #include <sys/systm.h>
 #include <sys/rwlock.h>