1 files changed, 18 insertions, 2 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 6d90ec524212..832473e30b36 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1377,13 +1377,29 @@ static const struct file_operations arp_seq_fops = {
         .release        = seq_release_net,
 };
 
-static int __init arp_proc_init(void)
+
+static int __net_init arp_net_init(struct net *net)
 {
-        if (!proc_net_fops_create(&init_net, "arp", S_IRUGO, &arp_seq_fops))
+        if (!proc_net_fops_create(net, "arp", S_IRUGO, &arp_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
+static void __net_exit arp_net_exit(struct net *net)
+{
+        proc_net_remove(net, "arp");
+}
+
+static struct pernet_operations arp_net_ops = {
+        .init = arp_net_init,
+        .exit = arp_net_exit,
+};
+
+static int __init arp_proc_init(void)
+{
+        return register_pernet_subsys(&arp_net_ops);
+}
+
 #else /* CONFIG_PROC_FS */
 
 static int __init arp_proc_init(void)