summaryrefslogtreecommitdiffstats
path: root/net/ipv6/proc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-11 13:40:56 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-11 13:40:56 +0200
commit251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 (patch)
tree3c20c3e080f276848f2ad67aadab44a5d64bfda9 /net/ipv6/proc.c
parent6679ce6e5f519096612b480d255d9ca97be0c2be (diff)
parent796aadeb1b2db9b5d463946766c5bbfd7717158c (diff)
downloadkernel-crypto-251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3.tar.gz
kernel-crypto-251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3.tar.xz
kernel-crypto-251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3.zip
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'net/ipv6/proc.c')
-rw-r--r--net/ipv6/proc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index f82f6074cf8..0179b66864f 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -286,7 +286,6 @@ proc_net_fail:
void ipv6_misc_proc_exit(void)
{
- proc_net_remove(&init_net, "sockstat6");
proc_net_remove(&init_net, "dev_snmp6");
proc_net_remove(&init_net, "snmp6");
unregister_pernet_subsys(&ipv6_proc_ops);