From 9d929c3861edd219d094739331cfdfd424e7d7a2 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 24 Mar 2008 15:28:43 -0700
Subject: [PATCH] --- yaml --- r: 90265 b: refs/heads/master c:
 ffc31d3d7719555cd784ecaf82e9c237f3a747ab h: refs/heads/master i:   90263:
 1f85673ac2cf791f56c92a320466750d54c3ec0e v: v3

---
 [refs]               |  2 +-
 trunk/net/ipv4/arp.c | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 07a853192097..9d0be8ecf34d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49e8a279a1b79e14b51aa6d4102b3a3de39e7a5e
+refs/heads/master: ffc31d3d7719555cd784ecaf82e9c237f3a747ab
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 6d90ec524212..832473e30b36 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/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)