powerpc/mm: use generic version of pmdp_clear_flush()

[mirror_ubuntu-artful-kernel.git] / mm / huge_memory.c

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 078832cf3636579e1d9cc1c396b037319e52a6bd..65dd8d67287bb38df5a86682924aa5a30d3a30f4 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2499,7 +2499,7 @@ static void collapse_huge_page(struct mm_struct *mm,
         * huge and small TLB entries for the same virtual address
         * to avoid the risk of CPU bugs in that area.
         */
-       _pmd = pmdp_clear_flush(vma, address, pmd);
+       _pmd = pmdp_collapse_flush(vma, address, pmd);
        spin_unlock(pmd_ptl);
        mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end);
 
@@ -2799,7 +2799,7 @@ static void khugepaged_do_scan(void)
 
                cond_resched();
 
-               if (unlikely(kthread_should_stop() || freezing(current)))
+               if (unlikely(kthread_should_stop() || try_to_freeze()))
                        break;
 
                spin_lock(&khugepaged_mm_lock);
@@ -2820,8 +2820,6 @@ static void khugepaged_do_scan(void)
 
 static void khugepaged_wait_work(void)
 {
-       try_to_freeze();
-
        if (khugepaged_has_work()) {
                if (!khugepaged_scan_sleep_millisecs)
                        return;