summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/huge_memory.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index dabd247df535..73266ee7274c 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2413,8 +2413,7 @@ static bool khugepaged_prealloc_page(struct page **hpage, bool *wait)
2413 2413
2414static struct page * 2414static struct page *
2415khugepaged_alloc_page(struct page **hpage, gfp_t gfp, struct mm_struct *mm, 2415khugepaged_alloc_page(struct page **hpage, gfp_t gfp, struct mm_struct *mm,
2416 struct vm_area_struct *vma, unsigned long address, 2416 unsigned long address, int node)
2417 int node)
2418{ 2417{
2419 VM_BUG_ON_PAGE(*hpage, *hpage); 2418 VM_BUG_ON_PAGE(*hpage, *hpage);
2420 2419
@@ -2481,8 +2480,7 @@ static bool khugepaged_prealloc_page(struct page **hpage, bool *wait)
2481 2480
2482static struct page * 2481static struct page *
2483khugepaged_alloc_page(struct page **hpage, gfp_t gfp, struct mm_struct *mm, 2482khugepaged_alloc_page(struct page **hpage, gfp_t gfp, struct mm_struct *mm,
2484 struct vm_area_struct *vma, unsigned long address, 2483 unsigned long address, int node)
2485 int node)
2486{ 2484{
2487 up_read(&mm->mmap_sem); 2485 up_read(&mm->mmap_sem);
2488 VM_BUG_ON(!*hpage); 2486 VM_BUG_ON(!*hpage);
@@ -2530,7 +2528,7 @@ static void collapse_huge_page(struct mm_struct *mm,
2530 __GFP_THISNODE; 2528 __GFP_THISNODE;
2531 2529
2532 /* release the mmap_sem read lock. */ 2530 /* release the mmap_sem read lock. */
2533 new_page = khugepaged_alloc_page(hpage, gfp, mm, vma, address, node); 2531 new_page = khugepaged_alloc_page(hpage, gfp, mm, address, node);
2534 if (!new_page) 2532 if (!new_page)
2535 return; 2533 return;
2536 2534