diff options
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index b3d73bb1f680..9c6ff7fffdc8 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1715,11 +1715,11 @@ gotten: | |||
1715 | if (unlikely(anon_vma_prepare(vma))) | 1715 | if (unlikely(anon_vma_prepare(vma))) |
1716 | goto oom; | 1716 | goto oom; |
1717 | if (old_page == ZERO_PAGE(address)) { | 1717 | if (old_page == ZERO_PAGE(address)) { |
1718 | new_page = alloc_zeroed_user_highpage(vma, address); | 1718 | new_page = alloc_zeroed_user_highpage_movable(vma, address); |
1719 | if (!new_page) | 1719 | if (!new_page) |
1720 | goto oom; | 1720 | goto oom; |
1721 | } else { | 1721 | } else { |
1722 | new_page = alloc_page_vma(GFP_HIGHUSER, vma, address); | 1722 | new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address); |
1723 | if (!new_page) | 1723 | if (!new_page) |
1724 | goto oom; | 1724 | goto oom; |
1725 | cow_user_page(new_page, old_page, address, vma); | 1725 | cow_user_page(new_page, old_page, address, vma); |
@@ -2237,7 +2237,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
2237 | 2237 | ||
2238 | if (unlikely(anon_vma_prepare(vma))) | 2238 | if (unlikely(anon_vma_prepare(vma))) |
2239 | goto oom; | 2239 | goto oom; |
2240 | page = alloc_zeroed_user_highpage(vma, address); | 2240 | page = alloc_zeroed_user_highpage_movable(vma, address); |
2241 | if (!page) | 2241 | if (!page) |
2242 | goto oom; | 2242 | goto oom; |
2243 | 2243 | ||
@@ -2340,7 +2340,8 @@ retry: | |||
2340 | 2340 | ||
2341 | if (unlikely(anon_vma_prepare(vma))) | 2341 | if (unlikely(anon_vma_prepare(vma))) |
2342 | goto oom; | 2342 | goto oom; |
2343 | page = alloc_page_vma(GFP_HIGHUSER, vma, address); | 2343 | page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, |
2344 | vma, address); | ||
2344 | if (!page) | 2345 | if (!page) |
2345 | goto oom; | 2346 | goto oom; |
2346 | copy_user_highpage(page, new_page, address, vma); | 2347 | copy_user_highpage(page, new_page, address, vma); |