Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent 6299b669b1
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 7 changed files with 8 additions and 6 deletions Side-by-side Diff

include/net/net_namespace.h
Diff comments   View file @ 04a6f82
... ... @@ -257,10 +257,12 @@
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 {
net/decnet/dn_rules.c
Diff comments   View file @ 04a6f82
... ... @@ -220,7 +220,7 @@
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),
net/ipv4/fib_rules.c
Diff comments   View file @ 04a6f82
... ... @@ -262,7 +262,7 @@
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),
... ... @@ -221,7 +221,7 @@
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),
net/ipv6/addrlabel.c
Diff comments   View file @ 04a6f82
... ... @@ -79,7 +79,7 @@
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;
net/ipv6/fib6_rules.c
Diff comments   View file @ 04a6f82
... ... @@ -238,7 +238,7 @@
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),
... ... @@ -205,7 +205,7 @@
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),