diff --git a/[refs] b/[refs]
index 098ce414d2a1..f8a9019bdd81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176c39af29bc4edaf37f663553eeaacd47b5bc9c
+refs/heads/master: 6eb0777228f31932fc941eafe8b08848466630a1
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index 705b33b184a3..fc562d29cc46 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -1205,7 +1205,7 @@ static struct pernet_operations __net_initdata icmp_sk_ops = {
 
 int __init icmp_init(void)
 {
-	return register_pernet_device(&icmp_sk_ops);
+	return register_pernet_subsys(&icmp_sk_ops);
 }
 
 EXPORT_SYMBOL(icmp_err_convert);