summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:12:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:45 +0900
commit04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa (patch)
treed9fb34c24277a6eec6f5da9aeff450aedb8e387c /net/ipv4/ipmr.c
parent6299b669b1340b9f7de2bc2bd565921a1494e7f7 (diff)
downloadblackbird-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/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 1daa95c2a0ba..6168c4dc58b1 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),
OpenPOWER on IntegriCloud