[PATCH] fix impossible VmallocChunk

VmallocTotal: 34359738367 kB
VmallocUsed:    266288 kB
VmallocChunk: 18014366299193295 kB
is unsettling - x86_64 and some other architectures keep a separate address
range for modules in vmalloc's vmlist, which /proc/meminfo should pass over.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/proc/mmu.c b/fs/proc/mmu.c
index a7041038ad56108ef45f195bedf109dbbb7ddb24..25d2d9c6e329c6b0eb04524cd80d2538cb3f4118 100644 (file)
--- a/fs/proc/mmu.c
+++ b/fs/proc/mmu.c
@@ -50,13 +50,23 @@ void get_vmalloc_info(struct vmalloc_info *vmi)
                read_lock(&vmlist_lock);
 
                for (vma = vmlist; vma; vma = vma->next) {
+                       unsigned long addr = (unsigned long) vma->addr;
+
+                       /*
+                        * Some archs keep another range for modules in vmlist
+                        */
+                       if (addr < VMALLOC_START)
+                               continue;
+                       if (addr >= VMALLOC_END)
+                               break;
+
                        vmi->used += vma->size;
 
-                       free_area_size = (unsigned long) vma->addr - prev_end;
+                       free_area_size = addr - prev_end;
                        if (vmi->largest_chunk < free_area_size)
                                vmi->largest_chunk = free_area_size;
 
-                       prev_end = vma->size + (unsigned long) vma->addr;
+                       prev_end = vma->size + addr;
                }
 
                if (VMALLOC_END - prev_end > vmi->largest_chunk)