From akpm@osdl.org Sat Mar 4 01:08:58 2006 Date: Sat, 04 Mar 2006 01:07:28 -0800 From: akpm@osdl.org To: akpm@osdl.org, clameter@engr.sgi.com, mm-commits@vger.kernel.org Subject: + numa_maps-update-tidy.patch added to -mm tree The patch titled numa_maps-update-tidy has been added to the -mm tree. Its filename is numa_maps-update-tidy.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this From: Andrew Morton Cc: Christoph Lameter Signed-off-by: Andrew Morton --- mm/mempolicy.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff -puN mm/mempolicy.c~numa_maps-update-tidy mm/mempolicy.c --- devel/mm/mempolicy.c~numa_maps-update-tidy 2006-03-04 01:00:44.000000000 -0800 +++ devel-akpm/mm/mempolicy.c 2006-03-04 01:02:34.000000000 -0800 @@ -1870,28 +1870,22 @@ int show_numa_map(struct seq_file *m, vo seq_printf(m, "%08lx %s", vma->vm_start, buffer); if (file) { - seq_printf(m, " file="); seq_path(m, file->f_vfsmnt, file->f_dentry, "\n\t"); - - } else if (vma->vm_start <= mm->brk && - vma->vm_end >= mm->start_brk) - - seq_printf(m, " heap"); - - else if (vma->vm_start <= mm->start_stack && - vma->vm_end >= mm->start_stack) - - seq_printf(m, " stack"); + } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { + seq_printf(m, " heap"); + } else if (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack) { + seq_printf(m, " stack"); + } if (is_vm_hugetlb_page(vma)) { - check_huge_range(vma, vma->vm_start, vma->vm_end, md); seq_printf(m, " huge"); - - } else + } else { check_pgd_range(vma, vma->vm_start, vma->vm_end, - &node_online_map, MPOL_MF_STATS, md); + &node_online_map, MPOL_MF_STATS, md); + } if (!md->pages) goto out; _