3 files changed, 94 insertions, 1 deletions

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 2d563979cb02..441a32f0e5f2 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -456,6 +456,20 @@ static const struct file_operations proc_slabstats_operations = {
 #endif
 #endif
 
+#ifdef CONFIG_MMU
+static int vmalloc_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &vmalloc_op);
+}
+
+static const struct file_operations proc_vmalloc_operations = {
+        .open           = vmalloc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+#endif
+
 static int show_stat(struct seq_file *p, void *v)
 {
         int i;
@@ -869,6 +883,9 @@ void __init proc_misc_init(void)
         create_seq_entry("slab_allocators", 0 ,&proc_slabstats_operations);
 #endif
 #endif
+#ifdef CONFIG_MMU
+        proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+#endif
         create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations);
         create_seq_entry("pagetypeinfo", S_IRUGO, &pagetypeinfo_file_ops);
         create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations);
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index ce8e7da05807..7f3adfda337a 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -87,4 +87,6 @@ extern void free_vm_area(struct vm_struct *area);
 extern rwlock_t vmlist_lock;
 extern struct vm_struct *vmlist;
 
+extern const struct seq_operations vmalloc_op;
+
 #endif /* _LINUX_VMALLOC_H */
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index ecf91f8034bf..afa550f66537 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -14,7 +14,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-
+#include <linux/seq_file.h>
 #include <linux/vmalloc.h>
 
 #include <asm/uaccess.h>
@@ -873,3 +873,77 @@ void free_vm_area(struct vm_struct *area)
         kfree(area);
 }
 EXPORT_SYMBOL_GPL(free_vm_area);
+
+
+#ifdef CONFIG_PROC_FS
+static void *s_start(struct seq_file *m, loff_t *pos)
+{
+        loff_t n = *pos;
+        struct vm_struct *v;
+
+        read_lock(&vmlist_lock);
+        v = vmlist;
+        while (n > 0 && v) {
+                n--;
+                v = v->next;
+        }
+        if (!n)
+                return v;
+
+        return NULL;
+
+}
+
+static void *s_next(struct seq_file *m, void *p, loff_t *pos)
+{
+        struct vm_struct *v = p;
+
+        ++*pos;
+        return v->next;
+}
+
+static void s_stop(struct seq_file *m, void *p)
+{
+        read_unlock(&vmlist_lock);
+}
+
+static int s_show(struct seq_file *m, void *p)
+{
+        struct vm_struct *v = p;
+
+        seq_printf(m, "0x%p-0x%p %7ld",
+                v->addr, v->addr + v->size, v->size);
+
+        if (v->nr_pages)
+                seq_printf(m, " pages=%d", v->nr_pages);
+
+        if (v->phys_addr)
+                seq_printf(m, " phys=%lx", v->phys_addr);
+
+        if (v->flags & VM_IOREMAP)
+                seq_printf(m, " ioremap");
+
+        if (v->flags & VM_ALLOC)
+                seq_printf(m, " vmalloc");
+
+        if (v->flags & VM_MAP)
+                seq_printf(m, " vmap");
+
+        if (v->flags & VM_USERMAP)
+                seq_printf(m, " user");
+
+        if (v->flags & VM_VPAGES)
+                seq_printf(m, " vpages");
+
+        seq_putc(m, '\n');
+        return 0;
+}
+
+const struct seq_operations vmalloc_op = {
+        .start = s_start,
+        .next = s_next,
+        .stop = s_stop,
+        .show = s_show,
+};
+#endif
+