diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:12:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:45 +0900 |
| commit | 04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa (patch) | |
| tree | d9fb34c24277a6eec6f5da9aeff450aedb8e387c /net/ipv4 | |
| parent | 6299b669b1340b9f7de2bc2bd565921a1494e7f7 (diff) | |
| download | linux-3.10-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.tar.gz linux-3.10-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.tar.bz2 linux-3.10-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.zip | |
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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_rules.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipmr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 274309d3ade..26aa65d1fce 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -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), diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 1daa95c2a0b..6168c4dc58b 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -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), |