diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
| commit | b75ec3af27bf011a760e2f44eb25a99b6fbb0fb3 (patch) | |
| tree | 89f4fbab2c6194b32a46eb771c4b158585bf0bb5 /mm/huge_memory.c | |
| parent | e7b63ff115f21ea6c609cbb08f3d489af627af6e (diff) | |
| parent | 523e13455ec9ec4457a5a1d24ff7132949742b70 (diff) | |
| download | op-kernel-dev-b75ec3af27bf011a760e2f44eb25a99b6fbb0fb3.zip op-kernel-dev-b75ec3af27bf011a760e2f44eb25a99b6fbb0fb3.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'mm/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 4b06b8d..bbac913 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2206,7 +2206,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, for (_pte = pte; _pte < pte+HPAGE_PMD_NR; _pte++, address += PAGE_SIZE) { pte_t pteval = *_pte; - if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { + if (pte_none(pteval) || (pte_present(pteval) && + is_zero_pfn(pte_pfn(pteval)))) { if (!userfaultfd_armed(vma) && ++none_or_zero <= khugepaged_max_ptes_none) continue; |
