Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[mv-sheeva.git] / net / sctp / proc.c

diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 5dd89831eceba6ca38e3b187ac465c2cbf387dc6..d093cbfeaac449855fcb89fcb87fe74daa523d90 100644 (file)
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -512,15 +512,8 @@ int __init sctp_remaddr_proc_init(void)
 {
        struct proc_dir_entry *p;
 
-       p = create_proc_entry("remaddr", S_IRUGO, proc_net_sctp);
+       p = proc_create("remaddr", S_IRUGO, proc_net_sctp, &sctp_remaddr_seq_fops);
        if (!p)
                return -ENOMEM;
-       p->proc_fops = &sctp_remaddr_seq_fops;
-
        return 0;
 }
-
-void sctp_assoc_proc_exit(void)
-{
-       remove_proc_entry("remaddr", proc_net_sctp);
-}