Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[deliverable/linux.git] / net / x25 / x25_proc.c

diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 3f52b09bed033fbb8f77e4b37342fd757183744d..0a04e62e0e187c454199e184c94c198fd37c53c9 100644 (file)
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -163,8 +163,8 @@ static int x25_seq_socket_show(struct seq_file *seq, void *v)
                   devname, x25->lci & 0x0FFF, x25->state, x25->vs, x25->vr,
                   x25->va, x25_display_timer(s) / HZ, x25->t2  / HZ,
                   x25->t21 / HZ, x25->t22 / HZ, x25->t23 / HZ,
-                  atomic_read(&s->sk_wmem_alloc),
-                  atomic_read(&s->sk_rmem_alloc),
+                  sk_wmem_alloc_get(s),
+                  sk_rmem_alloc_get(s),
                   s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
 out:
        return 0;
@@ -312,20 +312,18 @@ int __init x25_proc_init(void)
        if (!x25_proc_dir)
                goto out;
 
-       p = create_proc_entry("route", S_IRUGO, x25_proc_dir);
+       p = proc_create("route", S_IRUGO, x25_proc_dir, &x25_seq_route_fops);
        if (!p)
                goto out_route;
-       p->proc_fops = &x25_seq_route_fops;
 
-       p = create_proc_entry("socket", S_IRUGO, x25_proc_dir);
+       p = proc_create("socket", S_IRUGO, x25_proc_dir, &x25_seq_socket_fops);
        if (!p)
                goto out_socket;
-       p->proc_fops = &x25_seq_socket_fops;
 
-       p = create_proc_entry("forward", S_IRUGO, x25_proc_dir);
+       p = proc_create("forward", S_IRUGO, x25_proc_dir,
+                       &x25_seq_forward_fops);
        if (!p)
                goto out_forward;
-       p->proc_fops = &x25_seq_forward_fops;
        rc = 0;
 
 out: