aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNick Piggin <nickpiggin@yahoo.com.au>2006-03-06 18:42:57 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-06 21:40:45 -0500
commit5ddfae16bddb12104fff63c36fb5901f1a3729fc (patch)
tree70efe36cb2e33c57108916137c8f916692b30dc8 /fs
parentecbd3a632c8198744655b769c5c2b5a1455c1fba (diff)
[PATCH] smaps: hugepages fix
smaps doesn't have a hugepage pagetable walker. Skip walking hugepage vmas. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/task_mmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 0eaad41f4658..35787f907f12 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -289,7 +289,7 @@ static int show_smap(struct seq_file *m, void *v)
289 struct mem_size_stats mss; 289 struct mem_size_stats mss;
290 290
291 memset(&mss, 0, sizeof mss); 291 memset(&mss, 0, sizeof mss);
292 if (vma->vm_mm) 292 if (vma->vm_mm && !is_vm_hugetlb_page(vma))
293 smaps_pgd_range(vma, vma->vm_start, vma->vm_end, &mss); 293 smaps_pgd_range(vma, vma->vm_start, vma->vm_end, &mss);
294 return show_map_internal(m, v, &mss); 294 return show_map_internal(m, v, &mss);
295} 295}