diff options
| author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2012-10-08 16:29:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 16:22:27 +0900 |
| commit | b7231789b0224e73af4efc7973f8bcf17fc16edd (patch) | |
| tree | bc4234109f650f88d650a02211ca721dde673506 /mm | |
| parent | 26234f36ef3ec7efcfa9acb181427849c1f9db7c (diff) | |
| download | linux-stable-b7231789b0224e73af4efc7973f8bcf17fc16edd.tar.gz linux-stable-b7231789b0224e73af4efc7973f8bcf17fc16edd.tar.bz2 linux-stable-b7231789b0224e73af4efc7973f8bcf17fc16edd.zip | |
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/huge_memory.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f0e999379dd7..77b470b7e3c6 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -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; |