Commit 04a6f82c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in net 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6299b669

include/net/net_namespace.h

+2 −0
Original line number Diff line number Diff line
@@ -257,10 +257,12 @@ static inline struct net *read_pnet(struct net * const *pnet) 
#define __net_init

#define __net_exit

#define __net_initdata

#define __net_initconst

#else

#define __net_init	__init

#define __net_exit	__exit_refok

#define __net_initdata	__initdata

#define __net_initconst	__initconst

#endif



struct pernet_operations {

net/decnet/dn_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops) 
	dn_rt_cache_flush(-1);

}



static const struct fib_rules_ops __net_initdata dn_fib_rules_ops_template = {

static const struct fib_rules_ops __net_initconst dn_fib_rules_ops_template = {

	.family		= AF_DECnet,

	.rule_size	= sizeof(struct dn_fib_rule),

	.addr_size	= sizeof(u16),

net/ipv4/fib_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void fib4_rule_flush_cache(struct fib_rules_ops *ops) 
	rt_cache_flush(ops->fro_net);

}



static const struct fib_rules_ops __net_initdata fib4_rules_ops_template = {

static const struct fib_rules_ops __net_initconst fib4_rules_ops_template = {

	.family		= AF_INET,

	.rule_size	= sizeof(struct fib4_rule),

	.addr_size	= sizeof(u32),

net/ipv4/ipmr.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int ipmr_rule_fill(struct fib_rule *rule, struct sk_buff *skb, 
	return 0;

}



static const struct fib_rules_ops __net_initdata ipmr_rules_ops_template = {

static const struct fib_rules_ops __net_initconst ipmr_rules_ops_template = {

	.family		= RTNL_FAMILY_IPMR,

	.rule_size	= sizeof(struct ipmr_rule),

	.addr_size	= sizeof(u32),

net/ipv6/addrlabel.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct net *ip6addrlbl_net(const struct ip6addrlbl_entry *lbl) 


#define IPV6_ADDR_LABEL_DEFAULT	0xffffffffUL



static const __net_initdata struct ip6addrlbl_init_table

static const __net_initconst struct ip6addrlbl_init_table

{

	const struct in6_addr *prefix;

	int prefixlen;