All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] netmap: Rename the _count to _recount for kernel v4.8
@ 2016-10-26  8:03 jianchuan.wang
  2016-10-26 14:27 ` Martin Jansa
  0 siblings, 1 reply; 2+ messages in thread
From: jianchuan.wang @ 2016-10-26  8:03 UTC (permalink / raw)
  To: openembedded-devel

From: Jianchuan Wang <jianchuan.wang@windriver.com>

Rename the _count to _recount since Adjusting the member of struct page
in the kernel v4.8

Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.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(-)
 create mode 100644 meta-networking/recipes-kernel/netmap/files/0001-netmap-Rename-the-_conut-to-_recount.patch

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@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@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"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] netmap: Rename the _count to _recount for kernel v4.8
  2016-10-26  8:03 [PATCH] netmap: Rename the _count to _recount for kernel v4.8 jianchuan.wang
@ 2016-10-26 14:27 ` Martin Jansa
  0 siblings, 0 replies; 2+ messages in thread
From: Martin Jansa @ 2016-10-26 14:27 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 4721 bytes --]

On Wed, Oct 26, 2016 at 04:03:54PM +0800, jianchuan.wang@windriver.com wrote:
> From: Jianchuan Wang <jianchuan.wang@windriver.com>
> 
> Rename the _count to _recount since Adjusting the member of struct page
> in the kernel v4.8

Did you forgot to unblacklist netmap-modules?

ERROR: Nothing PROVIDES 'netmap-modules' (but
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap_git.bb
DEPENDS on or otherwise requires it)
ERROR: netmap-modules was skipped: Recipe is blacklisted: BROKEN: not
compatible with default kernel version 4.8
ERROR: Nothing RPROVIDES 'netmap' (but
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap_git.bb
RDEPENDS on or otherwise requires it)
ERROR: No eligible RPROVIDERs exist for 'netmap'
NOTE: Runtime target 'netmap' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['netmap']
ERROR: Nothing RPROVIDES 'netmap-dev' (but
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap_git.bb
RDEPENDS on or otherwise requires it)
ERROR: No eligible RPROVIDERs exist for 'netmap-dev'
NOTE: Runtime target 'netmap-dev' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['netmap-dev']

> 
> Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.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(-)
>  create mode 100644 meta-networking/recipes-kernel/netmap/files/0001-netmap-Rename-the-_conut-to-_recount.patch
> 
> 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@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@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"
> -- 
> 2.7.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-26 14:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-26  8:03 [PATCH] netmap: Rename the _count to _recount for kernel v4.8 jianchuan.wang
2016-10-26 14:27 ` Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.