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/fib6_rules.c | |
parent | 6299b669b1340b9f7de2bc2bd565921a1494e7f7 (diff) | |
download | talos-op-linux-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.tar.gz talos-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/fib6_rules.c')
-rw-r--r-- | net/ipv6/fib6_rules.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 0ff1cfd55bc4..d9fb9110f607 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -238,7 +238,7 @@ static size_t fib6_rule_nlmsg_payload(struct fib_rule *rule) + nla_total_size(16); /* src */ } -static const struct fib_rules_ops __net_initdata fib6_rules_ops_template = { +static const struct fib_rules_ops __net_initconst fib6_rules_ops_template = { .family = AF_INET6, .rule_size = sizeof(struct fib6_rule), .addr_size = sizeof(struct in6_addr), |