Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7231789 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Linus Torvalds
Browse files

thp: remove khugepaged_loop 



Merge khugepaged_loop into khugepaged

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26234f36

mm/huge_memory.c

+4 −10
Original line number Diff line number Diff line
@@ -2339,14 +2339,6 @@ static void khugepaged_wait_work(void) 
		wait_event_freezable(khugepaged_wait, khugepaged_wait_event());

}



static void khugepaged_loop(void)

{

	while (likely(khugepaged_enabled())) {

		khugepaged_do_scan();

		khugepaged_wait_work();

	}

}



static int khugepaged(void *none)

{

	struct mm_slot *mm_slot;
@@ -2354,8 +2346,10 @@ static int khugepaged(void *none) 
	set_freezable();

	set_user_nice(current, 19);



	while (!kthread_should_stop())

		khugepaged_loop();

	while (!kthread_should_stop()) {

		khugepaged_do_scan();

		khugepaged_wait_work();

	}



	spin_lock(&khugepaged_mm_lock);

	mm_slot = khugepaged_scan.mm_slot;