From 2bae67a22145e94056c46892115982f2b91684d8 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 16:29:42 -0700
Subject: [PATCH] --- yaml --- r: 332365 b: refs/heads/master c:
 e060f0e0139b83f05bb90fa05563d14179b9a7ff h: refs/heads/master i:   332363:
 ff53c9853d7b3842cb2a1a0ba1409cdd2029e192 v: v3

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

diff --git a/[refs] b/[refs]
index f2548755f7ba..461e3eee73a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 911891afe1c3104adf0f802189909868239ebbfd
+refs/heads/master: e060f0e0139b83f05bb90fa05563d14179b9a7ff
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index 0931b2b19c52..46e3f150a6ca 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -2333,11 +2333,8 @@ static int khugepaged(void *none)
 	set_freezable();
 	set_user_nice(current, 19);
 
-	while (!kthread_should_stop()) {
-		VM_BUG_ON(khugepaged_thread != current);
+	while (!kthread_should_stop())
 		khugepaged_loop();
-		VM_BUG_ON(khugepaged_thread != current);
-	}
 
 	spin_lock(&khugepaged_mm_lock);
 	mm_slot = khugepaged_scan.mm_slot;