From ff53c9853d7b3842cb2a1a0ba1409cdd2029e192 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 16:29:38 -0700
Subject: [PATCH] --- yaml --- r: 332363 b: refs/heads/master c:
 637e3a27ec2c84f7ecd083fa6943da2f19eb5e9f h: refs/heads/master i:   332361:
 a802f23db01e5ddbd32364babd6bcf6f867bcdb1   332359:
 3fcec9440cd14dc835ca20cf7edcfea6c0cf1256 v: v3

---
 [refs]                 | 2 +-
 trunk/mm/huge_memory.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f83a42e73793..a07d132b5ab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65b3c07b43f7f8a5cbf8923011bd4e6650e3d1dc
+refs/heads/master: 637e3a27ec2c84f7ecd083fa6943da2f19eb5e9f
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index 860ea9127851..9833d8ecf38f 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -140,10 +140,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,
@@ -163,7 +160,7 @@ static int start_khugepaged(void)
 	} else
 		/* wakeup to exit */
 		wake_up_interruptible(&khugepaged_wait);
-out:
+
 	return err;
 }