1 files changed, 22 insertions, 4 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 830a5580c5d7..bba06c41fc59 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -388,16 +388,14 @@ static void __vunmap(const void *addr, int deallocate_pages)
                 return;
 
         if ((PAGE_SIZE-1) & (unsigned long)addr) {
-                printk(KERN_ERR "Trying to vfree() bad address (%p)\n", addr);
-                WARN_ON(1);
+                WARN(1, KERN_ERR "Trying to vfree() bad address (%p)\n", addr);
                 return;
         }
 
         area = remove_vm_area(addr);
         if (unlikely(!area)) {
-                printk(KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n",
+                WARN(1, KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n",
                                 addr);
-                WARN_ON(1);
                 return;
         }
 
@@ -938,6 +936,25 @@ static void s_stop(struct seq_file *m, void *p)
         read_unlock(&vmlist_lock);
 }
 
+static void show_numa_info(struct seq_file *m, struct vm_struct *v)
+{
+        if (NUMA_BUILD) {
+                unsigned int nr, *counters = m->private;
+
+                if (!counters)
+                        return;
+
+                memset(counters, 0, nr_node_ids * sizeof(unsigned int));
+
+                for (nr = 0; nr < v->nr_pages; nr++)
+                        counters[page_to_nid(v->pages[nr])]++;
+
+                for_each_node_state(nr, N_HIGH_MEMORY)
+                        if (counters[nr])
+                                seq_printf(m, " N%u=%u", nr, counters[nr]);
+        }
+}
+
 static int s_show(struct seq_file *m, void *p)
 {
         struct vm_struct *v = p;
@@ -974,6 +991,7 @@ static int s_show(struct seq_file *m, void *p)
         if (v->flags & VM_VPAGES)
                 seq_printf(m, " vpages");
 
+        show_numa_info(m, v);
         seq_putc(m, '\n');
         return 0;
 }