Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

sections: fix section conflicts in net

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information...
commit 04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa 1 parent 6299b66
Andi Kleen authored committed
2  include/net/net_namespace.h
@@ -257,10 +257,12 @@ static inline struct net *read_pnet(struct net * const *pnet)
257 257 #define __net_init
258 258 #define __net_exit
259 259 #define __net_initdata
  260 +#define __net_initconst
260 261 #else
261 262 #define __net_init __init
262 263 #define __net_exit __exit_refok
263 264 #define __net_initdata __initdata
  265 +#define __net_initconst __initconst
264 266 #endif
265 267
266 268 struct pernet_operations {
2  net/decnet/dn_rules.c
@@ -220,7 +220,7 @@ static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)
220 220 dn_rt_cache_flush(-1);
221 221 }
222 222
223   -static const struct fib_rules_ops __net_initdata dn_fib_rules_ops_template = {
  223 +static const struct fib_rules_ops __net_initconst dn_fib_rules_ops_template = {
224 224 .family = AF_DECnet,
225 225 .rule_size = sizeof(struct dn_fib_rule),
226 226 .addr_size = sizeof(u16),
2  net/ipv4/fib_rules.c
@@ -262,7 +262,7 @@ static void fib4_rule_flush_cache(struct fib_rules_ops *ops)
262 262 rt_cache_flush(ops->fro_net);
263 263 }
264 264
265   -static const struct fib_rules_ops __net_initdata fib4_rules_ops_template = {
  265 +static const struct fib_rules_ops __net_initconst fib4_rules_ops_template = {
266 266 .family = AF_INET,
267 267 .rule_size = sizeof(struct fib4_rule),
268 268 .addr_size = sizeof(u32),
2  net/ipv4/ipmr.c
@@ -221,7 +221,7 @@ static int ipmr_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
221 221 return 0;
222 222 }
223 223
224   -static const struct fib_rules_ops __net_initdata ipmr_rules_ops_template = {
  224 +static const struct fib_rules_ops __net_initconst ipmr_rules_ops_template = {
225 225 .family = RTNL_FAMILY_IPMR,
226 226 .rule_size = sizeof(struct ipmr_rule),
227 227 .addr_size = sizeof(u32),
2  net/ipv6/addrlabel.c
@@ -79,7 +79,7 @@ struct net *ip6addrlbl_net(const struct ip6addrlbl_entry *lbl)
79 79
80 80 #define IPV6_ADDR_LABEL_DEFAULT 0xffffffffUL
81 81
82   -static const __net_initdata struct ip6addrlbl_init_table
  82 +static const __net_initconst struct ip6addrlbl_init_table
83 83 {
84 84 const struct in6_addr *prefix;
85 85 int prefixlen;
2  net/ipv6/fib6_rules.c
@@ -238,7 +238,7 @@ static size_t fib6_rule_nlmsg_payload(struct fib_rule *rule)
238 238 + nla_total_size(16); /* src */
239 239 }
240 240
241   -static const struct fib_rules_ops __net_initdata fib6_rules_ops_template = {
  241 +static const struct fib_rules_ops __net_initconst fib6_rules_ops_template = {
242 242 .family = AF_INET6,
243 243 .rule_size = sizeof(struct fib6_rule),
244 244 .addr_size = sizeof(struct in6_addr),
2  net/ipv6/ip6mr.c
@@ -205,7 +205,7 @@ static int ip6mr_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
205 205 return 0;
206 206 }
207 207
208   -static const struct fib_rules_ops __net_initdata ip6mr_rules_ops_template = {
  208 +static const struct fib_rules_ops __net_initconst ip6mr_rules_ops_template = {
209 209 .family = RTNL_FAMILY_IP6MR,
210 210 .rule_size = sizeof(struct ip6mr_rule),
211 211 .addr_size = sizeof(struct in6_addr),

0 comments on commit 04a6f82

Please sign in to comment.
Something went wrong with that request. Please try again.