1 files changed, 4 insertions, 3 deletions

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 99fc1fe950ee..5d9d5ffba145 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -22,6 +22,7 @@
 #include <linux/netdevice.h>
 #include <linux/atmclip.h>
 #include <linux/init.h> /* for __init */
+#include <net/net_namespace.h>
 #include <net/atmclip.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -175,7 +176,7 @@ static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
 
         seq_printf(seq, "%3d %3d %5d %-3s %7d %-5s %7d %-6s",
             vcc->dev->number,vcc->vpi,vcc->vci,
-            vcc->qos.aal >= sizeof(aal_name)/sizeof(aal_name[0]) ? "err" :
+            vcc->qos.aal >= ARRAY_SIZE(aal_name) ? "err" :
             aal_name[vcc->qos.aal],vcc->qos.rxtp.min_pcr,
             class_name[vcc->qos.rxtp.traffic_class],vcc->qos.txtp.min_pcr,
             class_name[vcc->qos.txtp.traffic_class]);
@@ -475,7 +476,7 @@ static void atm_proc_dirs_remove(void)
                 if (e->dirent)
                         remove_proc_entry(e->name, atm_proc_root);
         }
-        remove_proc_entry("net/atm", NULL);
+        remove_proc_entry("atm", init_net.proc_net);
 }
 
 int __init atm_proc_init(void)
@@ -483,7 +484,7 @@ int __init atm_proc_init(void)
         static struct atm_proc_entry *e;
         int ret;
 
-        atm_proc_root = proc_mkdir("net/atm",NULL);
+        atm_proc_root = proc_mkdir("atm", init_net.proc_net);
         if (!atm_proc_root)
                 goto err_out;
         for (e = atm_proc_ents; e->name; e++) {