Index: net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c =================================================================== --- net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c (nonexistent) +++ net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c (working copy) @@ -0,0 +1,27 @@ +--- kernel/freebsd/contigmem/contigmem.c.orig 2020-01-03 12:22:51 UTC ++++ kernel/freebsd/contigmem/contigmem.c +@@ -297,19 +297,22 @@ contigmem_cdev_pager_fault(vm_object_t object, vm_ooff + VM_OBJECT_WLOCK(object); + vm_page_updatefake(page, paddr, memattr); + } else { +- vm_page_t mret; + /* + * Replace the passed in reqpage page with our own fake page and + * free up the original page. + */ + page = vm_page_getfake(paddr, memattr); + VM_OBJECT_WLOCK(object); +- mret = vm_page_replace(page, object, (*mres)->pindex); ++#if __FreeBSD__ >= 13 ++ vm_page_replace(page, object, (*mres)->pindex, *mres); ++#else ++ vm_page_t mret = vm_page_replace(page, object, (*mres)->pindex); + KASSERT(mret == *mres, + ("invalid page replacement, old=%p, ret=%p", *mres, mret)); + vm_page_lock(mret); + vm_page_free(mret); + vm_page_unlock(mret); ++#endif + *mres = page; + } + Property changes on: net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h =================================================================== --- net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h (nonexistent) +++ net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h (working copy) @@ -0,0 +1,27 @@ +--- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2020-01-03 12:22:03 UTC ++++ lib/librte_eal/freebsd/eal/include/rte_os.h +@@ -29,6 +29,9 @@ typedef cpuset_t rte_cpuset_t; + CPU_COPY(&tmp, dst); \ + } while (0) + #define RTE_CPU_FILL(set) CPU_FILL(set) ++ ++/* In FreeBSD 13 CPU_NAND macro is CPU_ANDNOT */ ++#ifdef CPU_NAND + #define RTE_CPU_NOT(dst, src) do \ + { \ + cpuset_t tmp; \ +@@ -36,5 +39,14 @@ typedef cpuset_t rte_cpuset_t; + CPU_NAND(&tmp, src); \ + CPU_COPY(&tmp, dst); \ + } while (0) ++#else ++#define RTE_CPU_NOT(dst, src) do \ ++{ \ ++ cpuset_t tmp; \ ++ CPU_FILL(&tmp); \ ++ CPU_ANDNOT(&tmp, src); \ ++ CPU_COPY(&tmp, dst); \ ++} while (0) ++#endif + + #endif /* _RTE_OS_H_ */ Property changes on: net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property