1 files changed, 9 insertions, 3 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 96d63eb3ab17..ca71d5b81e4a 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1536,9 +1536,15 @@ new_slab:
          * That is only possible if certain conditions are met that are being
          * checked when a slab is created.
          */
-        if (!(gfpflags & __GFP_NORETRY) && (s->flags & __PAGE_ALLOC_FALLBACK))
-                return kmalloc_large(s->objsize, gfpflags);
-
+        if (!(gfpflags & __GFP_NORETRY) &&
+                                (s->flags & __PAGE_ALLOC_FALLBACK)) {
+                if (gfpflags & __GFP_WAIT)
+                        local_irq_enable();
+                object = kmalloc_large(s->objsize, gfpflags);
+                if (gfpflags & __GFP_WAIT)
+                        local_irq_disable();
+                return object;
+        }
         return NULL;
 debug:
         if (!alloc_debug_processing(s, c->page, object, addr))