mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

thp: remove khugepaged_loop 

Merge khugepaged_loop into khugepaged

Signed-off-by: Xiao 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Xiao Guangrong 2012-10-08 16:29:54 -07:00 committed by Linus Torvalds
parent 26234f36ef
commit b7231789b0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mm/huge_memory.c
View File

@ -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;