From: Xiao Guangrong Date: Fri, 28 Sep 2012 00:19:16 +0000 (+1000) Subject: thp: remove unnecessary check in start_khugepaged X-Git-Tag: next-20121004~1^2~333 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9429f1e8dafc294a187ea008db8c99a9c34a60e;p=karo-tx-linux.git thp: remove unnecessary check in start_khugepaged The check is unnecessary since if mm_slot_cache or mm_slots_hash initialize failed, no sysfs interface will be created Signed-off-by: Xiao Guangrong Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: David Rientjes Signed-off-by: Andrew Morton --- diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 13a1ff52c42a..2db4aef80f9d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -141,10 +141,7 @@ static int start_khugepaged(void) int err = 0; if (khugepaged_enabled()) { int wakeup; - if (unlikely(!mm_slot_cache || !mm_slots_hash)) { - err = -ENOMEM; - goto out; - } + mutex_lock(&khugepaged_mutex); if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, @@ -164,7 +161,7 @@ static int start_khugepaged(void) } else /* wakeup to exit */ wake_up_interruptible(&khugepaged_wait); -out: + return err; }