netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the rcu tree
@ 2017-01-19  3:34 Stephen Rothwell
  2017-01-19 21:54 ` Paul McKenney
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2017-01-19  3:34 UTC (permalink / raw)
  To: Paul E. McKenney, David Miller, Networking
  Cc: linux-next, linux-kernel, Ursula Braun

Hi Paul,

After merging the rcu tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

net/smc/af_smc.c:102:16: error: 'SLAB_DESTROY_BY_RCU' undeclared here (not in a function)
  .slab_flags = SLAB_DESTROY_BY_RCU,
                ^

Caused by commit

  c7a545924ca1 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU")

interacting with commit

  ac7138746e14 ("smc: establish new socket family")

from the net-next tree.

I have applied the following merge fix patch (someone will need to
remember to mention this to Linus):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2017 14:29:12 +1100
Subject: [PATCH] smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/smc/af_smc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 4875e65f0c4a..a48260f9ebb7 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -99,7 +99,7 @@ struct proto smc_proto = {
 	.unhash		= smc_unhash_sk,
 	.obj_size	= sizeof(struct smc_sock),
 	.h.smc_hash	= &smc_v4_hashinfo,
-	.slab_flags	= SLAB_DESTROY_BY_RCU,
+	.slab_flags	= SLAB_TYPESAFE_BY_RCU,
 };
 EXPORT_SYMBOL_GPL(smc_proto);
 
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* linux-next: build failure after merge of the rcu tree
@ 2010-09-17  2:42 Stephen Rothwell
  2010-09-17  4:39 ` David Miller
  2010-09-17 23:17 ` Paul E. McKenney
  0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2010-09-17  2:42 UTC (permalink / raw)
  To: Paul E. McKenney
  Cc: linux-next, linux-kernel, Eric Dumazet, David Miller, netdev

Hi Paul,

After merging the rcu tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/core/dev.c: In function 'netdev_run_todo':
net/core/dev.c:5294: error: dereferencing pointer to incomplete type
net/core/dev.c:5294: warning: type defaults to 'int' in declaration of '_________p1'
net/core/dev.c:5294: error: dereferencing pointer to incomplete type
net/core/dev.c:5294: warning: type defaults to 'int' in declaration of 'type name'
net/core/dev.c:5294: error: dereferencing pointer to incomplete type
net/core/dev.c:5294: warning: type defaults to 'int' in declaration of 'type name'
net/core/dev.c:5294: warning: comparison of distinct pointer types lacks a cast
net/core/dev.c:5294: error: dereferencing pointer to incomplete type
net/core/dev.c:5294: warning: type defaults to 'int' in declaration of 'type name'

Caused by commit ca5ecddfa8fcbd948c95530e7e817cee9fb43a3d ("rcu: define
__rcu address space modifier for sparse") interacting with commit
95ae6b228f814fc0528d0506ee9f18ac333d6851 ("ipv4: ip_ptr cleanups") from
the net tree.

rcu_dereference_raw() now needs to know the type of the object its
argument points to.  I added the following merge fix (which could be
applied to the net tree anyway).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Sep 2010 12:36:36 +1000
Subject: [PATCH] net: include inetdevice.h for rcu_dereference_raw api change

rcu_dereference_raw() now needs to know the type of its argument.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/core/dev.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index c6d837a..cadd28c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -129,6 +129,7 @@
 #include <linux/random.h>
 #include <trace/events/napi.h>
 #include <linux/pci.h>
+#include <linux/inetdevice.h>
 
 #include "net-sysfs.h"
 
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-03-08 18:06 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-19  3:34 linux-next: build failure after merge of the rcu tree Stephen Rothwell
2017-01-19 21:54 ` Paul McKenney
2017-02-13  2:21   ` Stephen Rothwell
2017-02-13  4:37     ` Paul E. McKenney
2017-02-13  6:43       ` Stephen Rothwell
2017-03-08  1:16         ` Stephen Rothwell
2017-03-08  1:37           ` Paul E. McKenney
2017-03-08 18:05           ` Paul E. McKenney
  -- strict thread matches above, loose matches on Subject: below --
2010-09-17  2:42 Stephen Rothwell
2010-09-17  4:39 ` David Miller
2010-09-17  5:34   ` Eric Dumazet
2010-09-17 23:17 ` Paul E. McKenney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).