kernel: do not mix const and __read_mostly

It makes no sense to mix these two. Either it is
writable-plus-read-mostly, or it is constant.

diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index df144cc39357725c10364522b142be4c2e0532cf..23661c4a89ee70e12e06e1a583a3fe408d760121 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -383,8 +383,7 @@ ip_set_get_n16(const struct nlattr *attr)
        return attr->nla_type & NLA_F_NET_BYTEORDER ? value : htons(value);
 }
 
-static const struct nla_policy
-ipaddr_policy[IPSET_ATTR_IPADDR_MAX + 1] __read_mostly = {
+static const struct nla_policy ipaddr_policy[IPSET_ATTR_IPADDR_MAX + 1] = {
        [IPSET_ATTR_IPADDR_IPV4]        = { .type = NLA_U32 },
        [IPSET_ATTR_IPADDR_IPV6]        = { .type = NLA_BINARY,
                                            .len = sizeof(struct in6_addr) },

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
index 85e23b28da0ab3f92c8d3bd7f1fa76a323d227f2..589b157b25b93789e9216d64aaae740529638141 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -592,7 +592,7 @@ static int
 type_pf_uadt(struct ip_set *set, struct nlattr *head, int len,
             enum ipset_adt adt, u32 *lineno, u32 flags);
 
-static const struct ip_set_type_variant type_pf_variant __read_mostly = {
+static const struct ip_set_type_variant type_pf_variant = {
        .kadt   = type_pf_kadt,
        .uadt   = type_pf_uadt,
        .adt    = {
@@ -986,7 +986,7 @@ nla_put_failure:
        return 0;
 }
 
-static const struct ip_set_type_variant type_pf_tvariant __read_mostly = {
+static const struct ip_set_type_variant type_pf_tvariant = {
        .kadt   = type_pf_kadt,
        .uadt   = type_pf_uadt,
        .adt    = {

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_chash.h b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
index 04955ef081a2fc5396d101b0927c7f0dd6f5f895..62756e50324fa582c110b3aaea1b16165afff9b8 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_chash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
@@ -636,7 +636,7 @@ static int
 type_pf_uadt(struct ip_set *set, struct nlattr *head, int len,
             enum ipset_adt adt, u32 *lineno, u32 flags);
 
-static const struct ip_set_type_variant type_pf_variant __read_mostly = {
+static const struct ip_set_type_variant type_pf_variant = {
        .kadt   = type_pf_kadt,
        .uadt   = type_pf_uadt,
        .adt    = {
@@ -1072,7 +1072,7 @@ nla_put_failure:
        return 0;
 }
 
-static const struct ip_set_type_variant type_pf_tvariant __read_mostly = {
+static const struct ip_set_type_variant type_pf_tvariant = {
        .kadt   = type_pf_kadt,
        .uadt   = type_pf_uadt,
        .adt    = {

diff --git a/kernel/ip_set.c b/kernel/ip_set.c
index ea4e888355391a28a290b19cb7efb6969f9d4b18..19a0571e071dec1f1ea7fc5bbae54e6660ae5a83 100644 (file)
--- a/kernel/ip_set.c
+++ b/kernel/ip_set.c
@@ -747,8 +747,7 @@ start_msg(struct sk_buff *skb, u32 pid, u32 seq, unsigned int flags,
 
 /* Create a set */
 
-static const struct nla_policy
-ip_set_create_policy[IPSET_ATTR_CMD_MAX + 1] __read_mostly = {
+static const struct nla_policy ip_set_create_policy[IPSET_ATTR_CMD_MAX + 1] = {
        [IPSET_ATTR_PROTOCOL]   = { .type = NLA_U8 },
        [IPSET_ATTR_SETNAME]    = { .type = NLA_NUL_STRING,
                                    .len = IPSET_MAXNAMELEN - 1 },
@@ -929,7 +928,7 @@ out:
 /* Destroy sets */
 
 static const struct nla_policy
-ip_set_setname_policy[IPSET_ATTR_CMD_MAX + 1] __read_mostly = {
+ip_set_setname_policy[IPSET_ATTR_CMD_MAX + 1] = {
        [IPSET_ATTR_PROTOCOL]   = { .type = NLA_U8 },
        [IPSET_ATTR_SETNAME]    = { .type = NLA_NUL_STRING,
                                    .len = IPSET_MAXNAMELEN - 1 },
@@ -1022,7 +1021,7 @@ ip_set_flush(struct sock *ctnl, struct sk_buff *skb,
 /* Rename a set */
 
 static const struct nla_policy
-ip_set_setname2_policy[IPSET_ATTR_CMD_MAX + 1] __read_mostly = {
+ip_set_setname2_policy[IPSET_ATTR_CMD_MAX + 1] = {
        [IPSET_ATTR_PROTOCOL]   = { .type = NLA_U8 },
        [IPSET_ATTR_SETNAME]    = { .type = NLA_NUL_STRING,
                                    .len = IPSET_MAXNAMELEN - 1 },
@@ -1306,8 +1305,7 @@ ip_set_dump(struct sock *ctnl, struct sk_buff *skb,
 
 /* Add, del and test */
 
-static const struct nla_policy
-ip_set_adt_policy[IPSET_ATTR_CMD_MAX + 1] __read_mostly = {
+static const struct nla_policy ip_set_adt_policy[IPSET_ATTR_CMD_MAX + 1] = {
        [IPSET_ATTR_PROTOCOL]   = { .type = NLA_U8 },
        [IPSET_ATTR_SETNAME]    = { .type = NLA_NUL_STRING,
                                    .len = IPSET_MAXNAMELEN - 1 },
@@ -1519,8 +1517,7 @@ nlmsg_failure:
 
 /* Get type data */
 
-static const struct nla_policy
-ip_set_type_policy[IPSET_ATTR_CMD_MAX + 1] __read_mostly = {
+static const struct nla_policy ip_set_type_policy[IPSET_ATTR_CMD_MAX + 1] = {
        [IPSET_ATTR_PROTOCOL]   = { .type = NLA_U8 },
        [IPSET_ATTR_TYPENAME]   = { .type = NLA_NUL_STRING,
                                    .len = IPSET_MAXNAMELEN - 1 },
@@ -1587,7 +1584,7 @@ nlmsg_failure:
 /* Get protocol version */
 
 static const struct nla_policy
-ip_set_protocol_policy[IPSET_ATTR_CMD_MAX + 1] __read_mostly = {
+ip_set_protocol_policy[IPSET_ATTR_CMD_MAX + 1] = {
        [IPSET_ATTR_PROTOCOL]   = { .type = NLA_U8 },
 };
 
@@ -1627,8 +1624,7 @@ nlmsg_failure:
        return -EFAULT;
 }
 
-static const struct nfnl_callback __read_mostly
-ip_set_netlink_subsys_cb[IPSET_MSG_MAX] = {
+static const struct nfnl_callback ip_set_netlink_subsys_cb[IPSET_MSG_MAX] = {
        [IPSET_CMD_CREATE]      = {
                .call           = ip_set_create,
                .attr_count     = IPSET_ATTR_CMD_MAX,

diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c
index 054c717f3a5fc75425c0ffc63b88c46d6cfa9501..470a42dd2f38775ef318e5df6d76545d96741333 100644 (file)
--- a/kernel/ip_set_bitmap_ip.c
+++ b/kernel/ip_set_bitmap_ip.c
@@ -100,8 +100,7 @@ bitmap_ip_kadt(struct ip_set *set, const struct sk_buff *skb,
        }
 }
 
-static const struct nla_policy
-bitmap_ip_adt_policy[IPSET_ATTR_ADT_MAX+1] __read_mostly = {
+static const struct nla_policy bitmap_ip_adt_policy[IPSET_ATTR_ADT_MAX+1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_CIDR]       = { .type = NLA_U8 },
@@ -269,7 +268,7 @@ bitmap_ip_same_set(const struct ip_set *a, const struct ip_set *b)
               && x->netmask == y->netmask;
 }
 
-static const struct ip_set_type_variant bitmap_ip __read_mostly = {
+static const struct ip_set_type_variant bitmap_ip = {
        .kadt   = bitmap_ip_kadt,
        .uadt   = bitmap_ip_uadt,
        .destroy = bitmap_ip_destroy,
@@ -517,7 +516,7 @@ bitmap_ip_timeout_same_set(const struct ip_set *a, const struct ip_set *b)
               && x->timeout == y->timeout;
 }
 
-static const struct ip_set_type_variant bitmap_ip_timeout __read_mostly = {
+static const struct ip_set_type_variant bitmap_ip_timeout = {
        .kadt   = bitmap_ip_timeout_kadt,
        .uadt   = bitmap_ip_timeout_uadt,
        .destroy = bitmap_ip_timeout_destroy,
@@ -562,7 +561,7 @@ bitmap_ip_gc_init(struct ip_set *set)
 /* Create bitmap:ip type of sets */
 
 static const struct nla_policy
-bitmap_ip_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+bitmap_ip_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_CIDR]       = { .type = NLA_U8 },

diff --git a/kernel/ip_set_bitmap_ipmac.c b/kernel/ip_set_bitmap_ipmac.c
index 9b2c02cf37cf1683967d76a13885aeb6bcbb5211..0bd9a89d5ea4f9cb4599ed5775eae5f9b64e6135 100644 (file)
--- a/kernel/ip_set_bitmap_ipmac.c
+++ b/kernel/ip_set_bitmap_ipmac.c
@@ -358,7 +358,7 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb,
 }
 
 static const struct nla_policy
-bitmap_ipmac_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+bitmap_ipmac_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_ETHER]      = { .type = NLA_BINARY, .len  = ETH_ALEN },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },
@@ -468,7 +468,7 @@ bitmap_ipmac_same_set(const struct ip_set *a, const struct ip_set *b)
               && x->timeout == y->timeout;
 }
 
-const struct ip_set_type_variant bitmap_ipmac __read_mostly = {
+const struct ip_set_type_variant bitmap_ipmac = {
        .kadt   = bitmap_ipmac_kadt,
        .uadt   = bitmap_ipmac_uadt,
        .adt    = {
@@ -483,7 +483,7 @@ const struct ip_set_type_variant bitmap_ipmac __read_mostly = {
        .same_set = bitmap_ipmac_same_set,
 };
 
-const struct ip_set_type_variant bitmap_tipmac __read_mostly = {
+const struct ip_set_type_variant bitmap_tipmac = {
        .kadt   = bitmap_ipmac_kadt,
        .uadt   = bitmap_ipmac_uadt,
        .adt    = {
@@ -536,7 +536,7 @@ bitmap_ipmac_gc_init(struct ip_set *set)
 /* Create bitmap:ip,mac type of sets */
 
 static const struct nla_policy
-bitmap_ipmac_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+bitmap_ipmac_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },

diff --git a/kernel/ip_set_bitmap_port.c b/kernel/ip_set_bitmap_port.c
index a430c0b547f7c3a118fa27b0a3f537ea1ea8bafd..eccef082fc1900856588bdfb69f8e1015cbdfa2f 100644 (file)
--- a/kernel/ip_set_bitmap_port.c
+++ b/kernel/ip_set_bitmap_port.c
@@ -95,8 +95,7 @@ bitmap_port_kadt(struct ip_set *set, const struct sk_buff *skb,
        }
 }
 
-static const struct nla_policy
-bitmap_port_adt_policy[IPSET_ATTR_ADT_MAX+1] __read_mostly = {
+static const struct nla_policy bitmap_port_adt_policy[IPSET_ATTR_ADT_MAX+1] = {
        [IPSET_ATTR_PORT]       = { .type = NLA_U16 },
        [IPSET_ATTR_PORT_TO]    = { .type = NLA_U16 },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },
@@ -251,7 +250,7 @@ bitmap_port_same_set(const struct ip_set *a, const struct ip_set *b)
               && x->last_port == y->last_port;
 }
 
-const struct ip_set_type_variant bitmap_port __read_mostly = {
+const struct ip_set_type_variant bitmap_port = {
        .kadt   = bitmap_port_kadt,
        .uadt   = bitmap_port_uadt,
        .destroy = bitmap_port_destroy,
@@ -489,7 +488,7 @@ bitmap_port_timeout_same_set(const struct ip_set *a, const struct ip_set *b)
               && x->timeout == y->timeout;
 }
 
-const struct ip_set_type_variant bitmap_port_timeout __read_mostly = {
+const struct ip_set_type_variant bitmap_port_timeout = {
        .kadt   = bitmap_port_timeout_kadt,
        .uadt   = bitmap_port_timeout_uadt,
        .destroy = bitmap_port_timeout_destroy,
@@ -535,7 +534,7 @@ bitmap_port_gc_init(struct ip_set *set)
 /* Create bitmap:ip type of sets */
 
 static const struct nla_policy
-bitmap_port_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+bitmap_port_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_PORT]       = { .type = NLA_U16 },
        [IPSET_ATTR_PORT_TO]    = { .type = NLA_U16 },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },

diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index bc0c706eaf252f35661a596ff0686761dd1ced25..583b572aebb395fdfb8d746cb3c61d0a2d053e1e 100644 (file)
--- a/kernel/ip_set_hash_ip.c
+++ b/kernel/ip_set_hash_ip.c
@@ -133,8 +133,7 @@ hash_ip4_kadt(struct ip_set *set, const struct sk_buff *skb,
        return adtfn(set, &ip, h->timeout);
 }
 
-static const struct nla_policy
-hash_ip4_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+static const struct nla_policy hash_ip4_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_CIDR]       = { .type = NLA_U8 },
@@ -323,8 +322,7 @@ hash_ip6_kadt(struct ip_set *set, const struct sk_buff *skb,
        return adtfn(set, &ip, h->timeout);
 }
 
-static const struct nla_policy
-hash_ip6_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+static const struct nla_policy hash_ip6_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },
        [IPSET_ATTR_LINENO]     = { .type = NLA_U32 },
@@ -370,7 +368,7 @@ hash_ip6_uadt(struct ip_set *set, struct nlattr *head, int len,
 /* Create hash:ip type of sets */
 
 static const struct nla_policy
-hash_ip_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+hash_ip_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_HASHSIZE]   = { .type = NLA_U32 },
        [IPSET_ATTR_MAXELEM]    = { .type = NLA_U32 },
        [IPSET_ATTR_PROBES]     = { .type = NLA_U8 },

diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c
index d9ee214ddef4bdf4b81a4738dd7385fc9c4b4311..16eed3625b1ca2f6e7762af71b8d58dc8925482f 100644 (file)
--- a/kernel/ip_set_hash_ipport.c
+++ b/kernel/ip_set_hash_ipport.c
@@ -154,7 +154,7 @@ hash_ipport4_kadt(struct ip_set *set, const struct sk_buff *skb,
 }
 
 static const struct nla_policy
-hash_ipport_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+hash_ipport_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_PORT]       = { .type = NLA_U16 },
@@ -466,7 +466,7 @@ hash_ipport6_uadt(struct ip_set *set, struct nlattr *head, int len,
 /* Create hash:ip type of sets */
 
 static const struct nla_policy
-hash_ipport_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+hash_ipport_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_HASHSIZE]   = { .type = NLA_U32 },
        [IPSET_ATTR_MAXELEM]    = { .type = NLA_U32 },
        [IPSET_ATTR_PROBES]     = { .type = NLA_U8 },

diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c
index b0aaf08c786c24f65f11337fa59f0393707c5da8..396273bddae8630773e40c05dd1d3776bcb183b3 100644 (file)
--- a/kernel/ip_set_hash_ipportip.c
+++ b/kernel/ip_set_hash_ipportip.c
@@ -160,7 +160,7 @@ hash_ipportip4_kadt(struct ip_set *set, const struct sk_buff *skb,
 }
 
 static const struct nla_policy
-hash_ipportip_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+hash_ipportip_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_IP2]        = { .type = NLA_NESTED },
@@ -487,7 +487,7 @@ hash_ipportip6_uadt(struct ip_set *set, struct nlattr *head, int len,
 /* Create hash:ip type of sets */
 
 static const struct nla_policy
-hash_ipportip_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+hash_ipportip_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_HASHSIZE]   = { .type = NLA_U32 },
        [IPSET_ATTR_MAXELEM]    = { .type = NLA_U32 },
        [IPSET_ATTR_PROBES]     = { .type = NLA_U8 },

diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index 6886aa8964b0d63b0780d2293a4a5a3fde84ffff..0021c0caa472095d6a8555581986434b5fcb76f2 100644 (file)
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -180,7 +180,7 @@ hash_ipportnet4_kadt(struct ip_set *set, const struct sk_buff *skb,
 }
 
 static const struct nla_policy
-hash_ipportnet_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+hash_ipportnet_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_IP_TO]      = { .type = NLA_NESTED },
        [IPSET_ATTR_IP2]        = { .type = NLA_NESTED },
@@ -550,7 +550,7 @@ hash_ipportnet6_uadt(struct ip_set *set, struct nlattr *head, int len,
 /* Create hash:ip type of sets */
 
 static const struct nla_policy
-hash_ipportnet_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+hash_ipportnet_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_HASHSIZE]   = { .type = NLA_U32 },
        [IPSET_ATTR_MAXELEM]    = { .type = NLA_U32 },
        [IPSET_ATTR_PROBES]     = { .type = NLA_U8 },

diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index b13ed98045e9926c1dd67617b6e7ea9064f7fa52..12828391541988e07b1a18e758109d25c7cc2f68 100644 (file)
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -155,8 +155,7 @@ hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb,
        return adtfn(set, &data, h->timeout);
 }
 
-static const struct nla_policy
-hash_net_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+static const struct nla_policy hash_net_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_CIDR]       = { .type = NLA_U8 },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },
@@ -382,7 +381,7 @@ hash_net6_uadt(struct ip_set *set, struct nlattr *head, int len,
 /* Create hash:ip type of sets */
 
 static const struct nla_policy
-hash_net_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+hash_net_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_HASHSIZE]   = { .type = NLA_U32 },
        [IPSET_ATTR_MAXELEM]    = { .type = NLA_U32 },
        [IPSET_ATTR_PROBES]     = { .type = NLA_U8 },

diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c
index 2c42c5b32eada91e0ae15587cef4a7f5af207aed..9c4767e2f164f6f413a407e67f5c0ccdada3ff3e 100644 (file)
--- a/kernel/ip_set_hash_netport.c
+++ b/kernel/ip_set_hash_netport.c
@@ -175,7 +175,7 @@ hash_netport4_kadt(struct ip_set *set, const struct sk_buff *skb,
 }
 
 static const struct nla_policy
-hash_netport_adt_policy[IPSET_ATTR_ADT_MAX + 1] __read_mostly = {
+hash_netport_adt_policy[IPSET_ATTR_ADT_MAX + 1] = {
        [IPSET_ATTR_IP]         = { .type = NLA_NESTED },
        [IPSET_ATTR_PORT]       = { .type = NLA_U16 },
        [IPSET_ATTR_PORT_TO]    = { .type = NLA_U16 },
@@ -500,7 +500,7 @@ hash_netport6_uadt(struct ip_set *set, struct nlattr *head, int len,
 /* Create hash:ip type of sets */
 
 static const struct nla_policy
-hash_netport_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+hash_netport_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_HASHSIZE]   = { .type = NLA_U32 },
        [IPSET_ATTR_MAXELEM]    = { .type = NLA_U32 },
        [IPSET_ATTR_PROBES]     = { .type = NLA_U8 },

diff --git a/kernel/ip_set_list_set.c b/kernel/ip_set_list_set.c
index fe4b410348e5378cdb0f2cab6d6b61103da334e3..a2c2eef1e7760374f785a608b884464b5050efbc 100644 (file)
--- a/kernel/ip_set_list_set.c
+++ b/kernel/ip_set_list_set.c
@@ -112,8 +112,7 @@ list_set_kadt(struct ip_set *set, const struct sk_buff *skb,
        return -EINVAL;
 }
 
-static const struct nla_policy
-list_set_adt_policy[IPSET_ATTR_ADT_MAX+1] __read_mostly = {
+static const struct nla_policy list_set_adt_policy[IPSET_ATTR_ADT_MAX+1] = {
        [IPSET_ATTR_NAME]       = { .type = NLA_STRING,
                                    .len = IPSET_MAXNAMELEN },
        [IPSET_ATTR_NAMEREF]    = { .type = NLA_STRING,
@@ -454,7 +453,7 @@ list_set_same_set(const struct ip_set *a, const struct ip_set *b)
               && x->timeout == y->timeout;
 }
 
-static const struct ip_set_type_variant list_set __read_mostly = {
+static const struct ip_set_type_variant list_set = {
        .kadt   = list_set_kadt,
        .uadt   = list_set_uadt,
        .destroy = list_set_destroy,
@@ -502,7 +501,7 @@ list_set_gc_init(struct ip_set *set)
 /* Create list:set type of sets */
 
 static const struct nla_policy
-list_set_create_policy[IPSET_ATTR_CREATE_MAX+1] __read_mostly = {
+list_set_create_policy[IPSET_ATTR_CREATE_MAX+1] = {
        [IPSET_ATTR_SIZE]       = { .type = NLA_U32 },
        [IPSET_ATTR_TIMEOUT]    = { .type = NLA_U32 },
 };