[oe-commits] [meta-openembedded] 13/13: netmap: Rename the _count to _recount for kernel v4.8

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit e9da4e025974c7ed7049f068abca267e7ea63d50
Author: Jianchuan Wang <jianchuan.wang at windriver.com>
AuthorDate: Wed Oct 26 16:03:54 2016 +0800

    netmap: Rename the _count to _recount for kernel v4.8
    
    Rename the _count to _recount since Adjusting the member of struct page
    in the kernel v4.8
    
    Signed-off-by: Jianchuan Wang <jianchuan.wang at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...0001-netmap-Rename-the-_conut-to-_recount.patch | 31 ++++++++++++++++++++++
 .../recipes-kernel/netmap/netmap-modules_git.bb    |  2 ++
 .../recipes-kernel/netmap/netmap_git.bb            |  2 --
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-kernel/netmap/files/0001-netmap-Rename-the-_conut-to-_recount.patch b/meta-networking/recipes-kernel/netmap/files/0001-netmap-Rename-the-_conut-to-_recount.patch
new file mode 100644
index 0000000..4a92a13
--- /dev/null
+++ b/meta-networking/recipes-kernel/netmap/files/0001-netmap-Rename-the-_conut-to-_recount.patch
@@ -0,0 +1,31 @@
+From 3de3d534c0b85f2d0378f699160e1a026a7317a7 Mon Sep 17 00:00:00 2001
+From: Jianchuan Wang <jianchuan.wang at windriver.com>
+Date: Wed, 26 Oct 2016 03:11:27 -0400
+Subject: [PATCH] netmap: Rename the _conut to _recount
+
+Rename the _count into _refcount since Adjusting the member of
+struct page in the kernel v4.8.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Jianchuan Wang <jianchuan.wang at windriver.com>
+---
+ LINUX/bsd_glue.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/LINUX/bsd_glue.h b/LINUX/bsd_glue.h
+index 9a116a0..8df6838 100644
+--- a/LINUX/bsd_glue.h
++++ b/LINUX/bsd_glue.h
+@@ -130,7 +130,7 @@ struct net_device_ops {
+ 	do {						  \
+ 		int i_;					  \
+ 		for (i_ = 1; i_ < (1 << (order)); i_++)	  \
+-			atomic_set(&(page)[i_]._count, 1);\
++			atomic_set(&(page)[i_]._refcount, 1);\
+ 	} while (0)
+ #endif /* HAVE_SPLIT_PAGE */
+ 
+-- 
+2.8.1
+
diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
index e9eea56..009f9bc 100644
--- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
+++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
@@ -44,6 +44,8 @@ python __anonymous () {
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,--as-needed', '')}"
 
+SRC_URI += "file://0001-netmap-Rename-the-_conut-to-_recount.patch"
+
 do_configure () {
     cd ${S}/LINUX
     ./configure ${EXTRA_OECONF}
diff --git a/meta-networking/recipes-kernel/netmap/netmap_git.bb b/meta-networking/recipes-kernel/netmap/netmap_git.bb
index 667e7cc..a5bc57a 100644
--- a/meta-networking/recipes-kernel/netmap/netmap_git.bb
+++ b/meta-networking/recipes-kernel/netmap/netmap_git.bb
@@ -33,5 +33,3 @@ FILES_${PN} += "${bindir}"
 RDEPENDS_${PN} = "kernel-module-netmap"
 RRECOMMENDS_${PN} = "kernel-module-netmap"
 
-# http://errors.yoctoproject.org/Errors/Details/69733/
-PNBLACKLIST[netmap] ?= "BROKEN: Tries to build kernel module and fails, either it should be disabled or there should be dependency on kernel like in netmap-modules"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.