1 files changed, 5 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8f65abeb9ad6..cd5390f2f18d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2296,7 +2296,11 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
         if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {
                 if (gfp_mask & __GFP_MEMALLOC)
                         alloc_flags |= ALLOC_NO_WATERMARKS;
-                else if (likely(!(gfp_mask & __GFP_NOMEMALLOC)) && !in_interrupt())
+                else if (in_serving_softirq() && (current->flags & PF_MEMALLOC))
+                        alloc_flags |= ALLOC_NO_WATERMARKS;
+                else if (!in_interrupt() &&
+                                ((current->flags & PF_MEMALLOC) ||
+                                 unlikely(test_thread_flag(TIF_MEMDIE))))
                         alloc_flags |= ALLOC_NO_WATERMARKS;
         }