diff options
| -rw-r--r-- | mm/huge_memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 9c0b17295ba0..95d1acb0f3d2 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
| @@ -1154,7 +1154,7 @@ alloc: | |||
| 1154 | new_page = NULL; | 1154 | new_page = NULL; |
| 1155 | 1155 | ||
| 1156 | if (unlikely(!new_page)) { | 1156 | if (unlikely(!new_page)) { |
| 1157 | if (is_huge_zero_pmd(orig_pmd)) { | 1157 | if (!page) { |
| 1158 | ret = do_huge_pmd_wp_zero_page_fallback(mm, vma, | 1158 | ret = do_huge_pmd_wp_zero_page_fallback(mm, vma, |
| 1159 | address, pmd, orig_pmd, haddr); | 1159 | address, pmd, orig_pmd, haddr); |
| 1160 | } else { | 1160 | } else { |
| @@ -1181,7 +1181,7 @@ alloc: | |||
| 1181 | 1181 | ||
| 1182 | count_vm_event(THP_FAULT_ALLOC); | 1182 | count_vm_event(THP_FAULT_ALLOC); |
| 1183 | 1183 | ||
| 1184 | if (is_huge_zero_pmd(orig_pmd)) | 1184 | if (!page) |
| 1185 | clear_huge_page(new_page, haddr, HPAGE_PMD_NR); | 1185 | clear_huge_page(new_page, haddr, HPAGE_PMD_NR); |
| 1186 | else | 1186 | else |
| 1187 | copy_user_huge_page(new_page, page, haddr, vma, HPAGE_PMD_NR); | 1187 | copy_user_huge_page(new_page, page, haddr, vma, HPAGE_PMD_NR); |
| @@ -1207,7 +1207,7 @@ alloc: | |||
| 1207 | page_add_new_anon_rmap(new_page, vma, haddr); | 1207 | page_add_new_anon_rmap(new_page, vma, haddr); |
| 1208 | set_pmd_at(mm, haddr, pmd, entry); | 1208 | set_pmd_at(mm, haddr, pmd, entry); |
| 1209 | update_mmu_cache_pmd(vma, address, pmd); | 1209 | update_mmu_cache_pmd(vma, address, pmd); |
| 1210 | if (is_huge_zero_pmd(orig_pmd)) { | 1210 | if (!page) { |
| 1211 | add_mm_counter(mm, MM_ANONPAGES, HPAGE_PMD_NR); | 1211 | add_mm_counter(mm, MM_ANONPAGES, HPAGE_PMD_NR); |
| 1212 | put_huge_zero_page(); | 1212 | put_huge_zero_page(); |
| 1213 | } else { | 1213 | } else { |
