---

yaml --- r: 213232 b: refs/heads/master c: 10ccd84 h: refs/heads/master v: v3
git-mirror · Oct 19, 2010 · 3f1e5cb · 3f1e5cb
1 parent e44bb63
commit 3f1e5cb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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();