From 31245b515ac7f0b15834e0eef701fd724ed1e09d Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 16 May 2005 21:53:09 -0700 Subject: [PATCH] --- yaml --- r: 1127 b: refs/heads/master c: 64d13c00cf1f7c3d2c1ff449e2a0500ab568d319 h: refs/heads/master i: 1125: baa46530b8ad752016aff456406551c2e0d5f1db 1123: 7f0eb4b81bec9ee19b33b7b7479693531f37d30b 1119: 480561a58aa1457fa190d322c4686efda4992a0f v: v3 --- [refs] | 2 +- trunk/fs/proc/mmu.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2101540c5eb0..a83e7a61f8e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: baae956100334ffbd101eea5eeea9a5ac9cf3abd +refs/heads/master: 64d13c00cf1f7c3d2c1ff449e2a0500ab568d319 diff --git a/trunk/fs/proc/mmu.c b/trunk/fs/proc/mmu.c index a7041038ad56..25d2d9c6e329 100644 --- a/trunk/fs/proc/mmu.c +++ b/trunk/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)