2.6.25-rc7

 net

 atm

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 5d9d5ff..e9693ae 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -142,6 +142,7 @@ static int vcc_seq_release(struct inode *inode, struct file *file)
 }
 
 static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
+   __acquires(vcc_sklist_lock)
 {
    struct vcc_state *state = seq->private;
    loff_t left = *pos;
@@ -152,6 +153,7 @@ static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
 }
 
 static void vcc_seq_stop(struct seq_file *seq, void *v)
+   __releases(vcc_sklist_lock)
 {
    read_unlock(&vcc_sklist_lock);
 }
@@ -433,11 +435,11 @@ int atm_proc_dev_register(struct atm_dev *dev)
       goto err_out;
    sprintf(dev->proc_name,"%s:%d",dev->type, dev->number);
 
-   dev->proc_entry = create_proc_entry(dev->proc_name, 0, atm_proc_root);
+   dev->proc_entry = proc_create(dev->proc_name, 0, atm_proc_root,
+                  &proc_atm_dev_ops);
    if (!dev->proc_entry)
       goto err_free_name;
    dev->proc_entry->data = dev;
-   dev->proc_entry->proc_fops = &proc_atm_dev_ops;
    dev->proc_entry->owner = THIS_MODULE;
    return 0;
 err_free_name:
@@ -476,7 +478,7 @@ static void atm_proc_dirs_remove(void)
       if (e->dirent)
          remove_proc_entry(e->name, atm_proc_root);
    }
-   remove_proc_entry("atm", init_net.proc_net);
+   proc_net_remove(&init_net, "atm");
 }
 
 int __init atm_proc_init(void)
@@ -484,16 +486,16 @@ int __init atm_proc_init(void)
    static struct atm_proc_entry *e;
    int ret;
 
-   atm_proc_root = proc_mkdir("atm", init_net.proc_net);
+   atm_proc_root = proc_net_mkdir(&init_net, "atm", init_net.proc_net);
    if (!atm_proc_root)
       goto err_out;
    for (e = atm_proc_ents; e->name; e++) {
       struct proc_dir_entry *dirent;
 
-      dirent = create_proc_entry(e->name, S_IRUGO, atm_proc_root);
+      dirent = proc_create(e->name, S_IRUGO,
+                 atm_proc_root, e->proc_fops);
       if (!dirent)
          goto err_out_remove;
-      dirent->proc_fops = e->proc_fops;
       dirent->owner = THIS_MODULE;
       e->dirent = dirent;
    }