Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pick up inside-secure fixes.

1 files changed, 8 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d4096f4a5c1f..73f5d4556b3d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2507,10 +2507,6 @@ void drain_all_pages(struct zone *zone)
         if (WARN_ON_ONCE(!mm_percpu_wq))
                 return;
 
-        /* Workqueues cannot recurse */
-        if (current->flags & PF_WQ_WORKER)
-                return;
-
         /*
          * Do not drain if one is already in progress unless it's specific to
          * a zone. Such callers are primarily CMA and memory hotplug and need
@@ -7656,11 +7652,18 @@ int alloc_contig_range(unsigned long start, unsigned long end,
 
         /*
          * In case of -EBUSY, we'd like to know which page causes problem.
-         * So, just fall through. We will check it in test_pages_isolated().
+         * So, just fall through. test_pages_isolated() has a tracepoint
+         * which will report the busy page.
+         *
+         * It is possible that busy pages could become available before
+         * the call to test_pages_isolated, and the range will actually be
+         * allocated.  So, if we fall through be sure to clear ret so that
+         * -EBUSY is not accidentally used or returned to caller.
          */
         ret = __alloc_contig_migrate_range(&cc, start, end);
         if (ret && ret != -EBUSY)
                 goto done;
+        ret =0;
 
         /*
          * Pages from [start, end) are within a MAX_ORDER_NR_PAGES