On Fri, 6 Jun 2014 18:58:40 -0400 Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> wrote:
> @@ -233,12 +163,20 @@ static long do_mincore(unsigned long addr, unsigned long pages, unsigned char *v
>
> end = min(vma->vm_end, addr + (pages << PAGE_SHIFT));
>
> - if (is_vm_hugetlb_page(vma))
> - mincore_hugetlb_page_range(vma, addr, end, vec);
> + struct mm_walk mincore_walk = {
> + .pmd_entry = mincore_pmd,
> + .pte_entry = mincore_pte,
> + .pte_hole = mincore_hole,
> + .hugetlb_entry = mincore_hugetlb,
> + .mm = vma->vm_mm,
> + .vma = vma,
> + .private = vec,
> + };
> + err = walk_page_vma(vma, &mincore_walk);
> + if (err < 0)
> + return err;
> else
> - mincore_page_range(vma, addr, end, vec);
> -
> - return (end - addr) >> PAGE_SHIFT;
> + return (end - addr) >> PAGE_SHIFT;
> }
>
> /*
Please review carefully.
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mincore-apply-page-table-walker-on-do_mincore-fix
mm/mincore.c: In function 'do_mincore':
mm/mincore.c:166: warning: ISO C90 forbids mixed declarations and code
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mincore.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff -puN mm/huge_memory.c~mincore-apply-page-table-walker-on-do_mincore-fix mm/huge_memory.c
diff -puN mm/mincore.c~mincore-apply-page-table-walker-on-do_mincore-fix mm/mincore.c
--- a/mm/mincore.c~mincore-apply-page-table-walker-on-do_mincore-fix
+++ a/mm/mincore.c
@@ -151,32 +151,34 @@ static int mincore_pmd(pmd_t *pmd, unsig
* all the arguments, we hold the mmap semaphore: we should
* just return the amount of info we're asked for.
*/
-static long do_mincore(unsigned long addr, unsigned long pages, unsigned char *vec)
+static long do_mincore(unsigned long addr, unsigned long pages,
+ unsigned char *vec)
{
struct vm_area_struct *vma;
- unsigned long end;
int err;
-
- vma = find_vma(current->mm, addr);
- if (!vma || addr < vma->vm_start)
- return -ENOMEM;
-
- end = min(vma->vm_end, addr + (pages << PAGE_SHIFT));
-
struct mm_walk mincore_walk = {
.pmd_entry = mincore_pmd,
.pte_entry = mincore_pte,
.pte_hole = mincore_hole,
.hugetlb_entry = mincore_hugetlb,
- .mm = vma->vm_mm,
- .vma = vma,
.private = vec,
};
+
+ vma = find_vma(current->mm, addr);
+ if (!vma || addr < vma->vm_start)
+ return -ENOMEM;
+ mincore_walk.vma = vma;
+ mincore_walk.mm = vma->vm_mm;
+
err = walk_page_vma(vma, &mincore_walk);
- if (err < 0)
+ if (err < 0) {
return err;
- else
+ } else {
+ unsigned long end;
+
+ end = min(vma->vm_end, addr + (pages << PAGE_SHIFT));
return (end - addr) >> PAGE_SHIFT;
+ }
}
/*
_
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>