From 2b4226ccd6e0a9d4f1ad458ed43cf939dc3a7eca Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Mon, 8 Oct 2012 16:29:54 -0700 Subject: [PATCH] --- yaml --- r: 332371 b: refs/heads/master c: b7231789b0224e73af4efc7973f8bcf17fc16edd h: refs/heads/master i: 332369: 3932df6fae6fe04f70ab55329a0fedf376979ef3 332367: 50222e5444e0e96f6ce824ca65c93ece97f669e6 v: v3 --- [refs] | 2 +- trunk/mm/huge_memory.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index b295df184148..7144c999193c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26234f36ef3ec7efcfa9acb181427849c1f9db7c +refs/heads/master: b7231789b0224e73af4efc7973f8bcf17fc16edd diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index f0e999379dd7..77b470b7e3c6 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/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;