commit 04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa
author Andi Kleen <ak@linux.intel.com> Thu Oct 04 17:12:11 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Oct 06 03:04:45 2012 +0900
tree d9fb34c24277a6eec6f5da9aeff450aedb8e387c
parent 6299b669b1340b9f7de2bc2bd565921a1494e7f7

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>

net/ipv6/addrlabel.c

diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 4be23da..ff76eec 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -79,7 +79,7 @@
 
 #define IPV6_ADDR_LABEL_DEFAULT	0xffffffffUL
 
-static const __net_initdata struct ip6addrlbl_init_table
+static const __net_initconst struct ip6addrlbl_init_table
 {
 	const struct in6_addr *prefix;
 	int prefixlen;