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/ipv6/ip6mr.c | |
| parent | 6299b669b1340b9f7de2bc2bd565921a1494e7f7 (diff) | |
| download | blackbird-op-linux-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.tar.gz blackbird-op-linux-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/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 08ea3f0b6e55..f7c7c6319720 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -205,7 +205,7 @@ static int ip6mr_rule_fill(struct fib_rule *rule, struct sk_buff *skb, return 0; } -static const struct fib_rules_ops __net_initdata ip6mr_rules_ops_template = { +static const struct fib_rules_ops __net_initconst ip6mr_rules_ops_template = { .family = RTNL_FAMILY_IP6MR, .rule_size = sizeof(struct ip6mr_rule), .addr_size = sizeof(struct in6_addr), |
