From 3f1e5cb0e4cb6aca303b38b7a258a97f0f50f6e5 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 19 Oct 2010 11:08:41 +0200
Subject: [PATCH] --- yaml --- r: 213232 b: refs/heads/master c:
 10ccd84695c2a03075bad2f4fc728575fe9051f8 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory_hotplug.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3efec7ddd21d..788a672bb92f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e24dcbef93dbbf529fbedfc6ce8ab22d2cef35f0
+refs/heads/master: 10ccd84695c2a03075bad2f4fc728575fe9051f8
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index dd186c1a5d53..d4e940a26945 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -840,7 +840,6 @@ static int offline_pages(unsigned long start_pfn,
 	ret = 0;
 	if (drain) {
 		lru_add_drain_all();
-		flush_scheduled_work();
 		cond_resched();
 		drain_all_pages();
 	}
@@ -862,7 +861,6 @@ static int offline_pages(unsigned long start_pfn,
 	}
 	/* drain all zone's lru pagevec, this is asyncronous... */
 	lru_add_drain_all();
-	flush_scheduled_work();
 	yield();
 	/* drain pcp pages , this is synchrouns. */
 	drain_all_pages();