aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2011-10-31 17:06:32 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:36:15 -0800
commitb5e074a6ff4cfa090f7aa8a87f5079d19206d91c (patch)
treea34d7a5a00ee329aa28c3b2a3b5f9482c358f235 /fs/proc
parent1eac959e6961083087486015d87d0209a0ae45a8 (diff)
downloadkernel_samsung_aries-b5e074a6ff4cfa090f7aa8a87f5079d19206d91c.zip
kernel_samsung_aries-b5e074a6ff4cfa090f7aa8a87f5079d19206d91c.tar.gz
kernel_samsung_aries-b5e074a6ff4cfa090f7aa8a87f5079d19206d91c.tar.bz2
/proc/self/numa_maps: restore "huge" tag for hugetlb vmas
commit fc360bd9cdcf875639a77f07fafec26699c546f3 upstream. The display of the "huge" tag was accidentally removed in 29ea2f698 ("mm: use walk_page_range() instead of custom page table walking code"). Reported-by: Stephen Hemminger <shemminger@vyatta.com> Tested-by: Stephen Hemminger <shemminger@vyatta.com> Reviewed-by: Stephen Wilson <wilsons@start.ca> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/task_mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 5afaa58..c7d4ee6 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1039,6 +1039,9 @@ static int show_numa_map(struct seq_file *m, void *v)
seq_printf(m, " stack");
}
+ if (is_vm_hugetlb_page(vma))
+ seq_printf(m, " huge");
+
walk_page_range(vma->vm_start, vma->vm_end, &walk);
if (!md->pages)