kernel: use __read_mostly for registration-type structures

Here is where __read_mostly goes :-)

diff --git a/kernel/ip_set.c b/kernel/ip_set.c
index 19a0571e071dec1f1ea7fc5bbae54e6660ae5a83..038a70eec97d0b4fbf87df2bdc5276eec762d1da 100644 (file)
--- a/kernel/ip_set.c
+++ b/kernel/ip_set.c
@@ -1692,7 +1692,7 @@ static const struct nfnl_callback ip_set_netlink_subsys_cb[IPSET_MSG_MAX] = {
        },
 };
 
-static struct nfnetlink_subsystem ip_set_netlink_subsys = {
+static struct nfnetlink_subsystem ip_set_netlink_subsys __read_mostly = {
        .name           = "ip_set",
        .subsys_id      = NFNL_SUBSYS_IPSET,
        .cb_count       = IPSET_MSG_MAX,
@@ -1791,7 +1791,7 @@ done:
        return ret;
 }
 
-static struct nf_sockopt_ops so_set = {
+static struct nf_sockopt_ops so_set __read_mostly = {
        .pf             = PF_INET,
        .get_optmin     = SO_IP_SET,
        .get_optmax     = SO_IP_SET + 1,

diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c
index 470a42dd2f38775ef318e5df6d76545d96741333..2f124ec5673c9c62bbdda5e51d0a2d019871729f 100644 (file)
--- a/kernel/ip_set_bitmap_ip.c
+++ b/kernel/ip_set_bitmap_ip.c
@@ -700,7 +700,7 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *head, int len,
        return 0;
 }
 
-static struct ip_set_type bitmap_ip_type = {
+static struct ip_set_type bitmap_ip_type __read_mostly = {
        .name           = "bitmap:ip",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP,

diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index 583b572aebb395fdfb8d746cb3c61d0a2d053e1e..6859ac8a569457bd1f9415c18af85ff2fccbaa0e 100644 (file)
--- a/kernel/ip_set_hash_ip.c
+++ b/kernel/ip_set_hash_ip.c
@@ -457,7 +457,7 @@ hash_ip_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
        return 0;
 }
 
-static struct ip_set_type hash_ip_type = {
+static struct ip_set_type hash_ip_type __read_mostly = {
        .name           = "hash:ip",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP,

diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c
index 16eed3625b1ca2f6e7762af71b8d58dc8925482f..f9db93ddd7b10434c7e44e1db8d9ee28a06c8093 100644 (file)
--- a/kernel/ip_set_hash_ipport.c
+++ b/kernel/ip_set_hash_ipport.c
@@ -542,7 +542,7 @@ hash_ipport_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
        return 0;
 }
 
-static struct ip_set_type hash_ipport_type = {
+static struct ip_set_type hash_ipport_type __read_mostly = {
        .name           = "hash:ip,port",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP | IPSET_TYPE_PORT,

diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c
index 396273bddae8630773e40c05dd1d3776bcb183b3..5511bbf3b2e93b9298f3dbb72262c785df90fe87 100644 (file)
--- a/kernel/ip_set_hash_ipportip.c
+++ b/kernel/ip_set_hash_ipportip.c
@@ -563,7 +563,7 @@ hash_ipportip_create(struct ip_set *set, struct nlattr *head,
        return 0;
 }
 
-static struct ip_set_type hash_ipportip_type = {
+static struct ip_set_type hash_ipportip_type __read_mostly = {
        .name           = "hash:ip,port,ip",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP | IPSET_TYPE_PORT | IPSET_TYPE_IP2,

diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index 0021c0caa472095d6a8555581986434b5fcb76f2..5775c5753896d23fa0aa17028d3d70ca9d540ced 100644 (file)
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -629,7 +629,7 @@ hash_ipportnet_create(struct ip_set *set, struct nlattr *head,
        return 0;
 }
 
-static struct ip_set_type hash_ipportnet_type = {
+static struct ip_set_type hash_ipportnet_type __read_mostly = {
        .name           = "hash:ip,port,net",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP | IPSET_TYPE_PORT | IPSET_TYPE_IP2,

diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index 12828391541988e07b1a18e758109d25c7cc2f68..5e3086ba131267590face277371820931d51cca5 100644 (file)
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -458,7 +458,7 @@ hash_net_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
        return 0;
 }
 
-static struct ip_set_type hash_net_type = {
+static struct ip_set_type hash_net_type __read_mostly = {
        .name           = "hash:net",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP,

diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c
index 9c4767e2f164f6f413a407e67f5c0ccdada3ff3e..c3f47a1dc5e1d020b9dba41e0d325f87f2b72bd6 100644 (file)
--- a/kernel/ip_set_hash_netport.c
+++ b/kernel/ip_set_hash_netport.c
@@ -578,7 +578,7 @@ hash_netport_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
        return 0;
 }
 
-static struct ip_set_type hash_netport_type = {
+static struct ip_set_type hash_netport_type __read_mostly = {
        .name           = "hash:net,port",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_IP | IPSET_TYPE_PORT,

diff --git a/kernel/ip_set_list_set.c b/kernel/ip_set_list_set.c
index a2c2eef1e7760374f785a608b884464b5050efbc..07d992910b300eb37794894233448057d07b0b66 100644 (file)
--- a/kernel/ip_set_list_set.c
+++ b/kernel/ip_set_list_set.c
@@ -562,7 +562,7 @@ list_set_create(struct ip_set *set, struct nlattr *head, int len,
        return 0;
 }
 
-static struct ip_set_type list_set_type = {
+static struct ip_set_type list_set_type __read_mostly = {
        .name           = "list:set",
        .protocol       = IPSET_PROTOCOL,
        .features       = IPSET_TYPE_NAME | IPSET_DUMP_LAST,