diff --git a/[refs] b/[refs] index f2548755f7ba..461e3eee73a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 911891afe1c3104adf0f802189909868239ebbfd +refs/heads/master: e060f0e0139b83f05bb90fa05563d14179b9a7ff diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index 0931b2b19c52..46e3f150a6ca 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/mm/huge_memory.c @@ -2333,11 +2333,8 @@ static int khugepaged(void *none) set_freezable(); set_user_nice(current, 19); - while (!kthread_should_stop()) { - VM_BUG_ON(khugepaged_thread != current); + while (!kthread_should_stop()) khugepaged_loop(); - VM_BUG_ON(khugepaged_thread != current); - } spin_lock(&khugepaged_mm_lock); mm_slot = khugepaged_scan.mm_slot;