2 files changed, 4 insertions, 1 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index c3429a710ab1..8002e1faccda 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1290,7 +1290,7 @@ struct page *alloc_pages_current(gfp_t gfp, unsigned order)
 
         if ((gfp & __GFP_WAIT) && !in_interrupt())
                 cpuset_update_task_memory_state();
-        if (!pol || in_interrupt())
+        if (!pol || in_interrupt() || (gfp & __GFP_THISNODE))
                 pol = &default_policy;
         if (pol->policy == MPOL_INTERLEAVE)
                 return alloc_page_interleave(gfp, order, interleave_nodes(pol));
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 208a6b03aa78..ea498788af53 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -893,6 +893,9 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order,
          * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
          */
         do {
+                if (unlikely((gfp_mask & __GFP_THISNODE) &&
+                        (*z)->zone_pgdat != zonelist->zones[0]->zone_pgdat))
+                                break;
                 if ((alloc_flags & ALLOC_CPUSET) &&
                                 !cpuset_zone_allowed(*z, gfp_mask))
                         continue;