gpio: Fix up merge collision in include file

[linux.git] / mm / madvise.c

diff --git a/mm/madvise.c b/mm/madvise.c
index 628022e674a7f52bc8c600106113ac0d8080dbb4..968df3aa069fda3ca88121769ddad04e7390fe6e 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -354,7 +354,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,
                        continue;
                }
 
-               page = _vm_normal_page(vma, addr, ptent, true);
+               page = vm_normal_page(vma, addr, ptent);
                if (!page)
                        continue;