diff --git a/[refs] b/[refs]
index 8575eab77d32..a2a7e8793f45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6e8f27f3c02b0c0d0c45d14b2f4a8810c9a7dc7
+refs/heads/master: 959d2726499175c6b724d87fed1dafca7582efe2
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index 382800a62b31..3f50807237e0 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -1207,7 +1207,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);