3 files changed, 7 insertions, 11 deletions

diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 43d23948384a..74ea974f5ca6 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -120,7 +120,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                 K(i.freeram-i.freehigh),
 #endif
 #ifndef CONFIG_MMU
-                K((unsigned long) atomic_read(&mmap_pages_allocated)),
+                K((unsigned long) atomic_long_read(&mmap_pages_allocated)),
 #endif
                 K(i.totalswap),
                 K(i.freeswap),
diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index 4a9e0f65ae60..83adcc869437 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -144,16 +144,12 @@ void proc_tty_register_driver(struct tty_driver *driver)
 {
         struct proc_dir_entry *ent;
                 
-        if (!driver->ops->read_proc || !driver->driver_name ||
-            driver->proc_entry)
+        if (!driver->driver_name || driver->proc_entry ||
+            !driver->ops->proc_fops)
                 return;
 
-        ent = create_proc_entry(driver->driver_name, 0, proc_tty_driver);
-        if (!ent)
-                return;
-        ent->read_proc = driver->ops->read_proc;
-        ent->data = driver;
-
+        ent = proc_create_data(driver->driver_name, 0, proc_tty_driver,
+                               driver->ops->proc_fops, driver);
         driver->proc_entry = ent;
 }
 
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 253afc04484c..863464d5519c 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -137,14 +137,14 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
         }
 
         seq_printf(m,
-                   "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n",
+                   "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
                    vma->vm_start,
                    vma->vm_end,
                    flags & VM_READ ? 'r' : '-',
                    flags & VM_WRITE ? 'w' : '-',
                    flags & VM_EXEC ? 'x' : '-',
                    flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p',
-                   vma->vm_pgoff << PAGE_SHIFT,
+                   (unsigned long long) vma->vm_pgoff << PAGE_SHIFT,
                    MAJOR(dev), MINOR(dev), ino, &len);
 
         if (file) {