thp: cleanup how khugepaged enters freezer

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

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 078832cf3636579e1d9cc1c396b037319e52a6bd..b3d8cd8d6968e752676598ade11cb996fc84d48e 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -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;