Merge branch 'master' into for-linus

Conflicts:
	include/linux/percpu.h
	mm/percpu.c

1 files changed, 0 insertions, 2 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index dd186c1a5d5..d4e940a2694 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -840,7 +840,6 @@ repeat:
         ret = 0;
         if (drain) {
                 lru_add_drain_all();
-                flush_scheduled_work();
                 cond_resched();
                 drain_all_pages();
         }
@@ -862,7 +861,6 @@ repeat:
         }
         /* 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();