diff --git a/[refs] b/[refs] index afed3ba42c2d..58ec10e3d951 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfd19c5a9ecf8e5e38de2603077c4330af21316e +refs/heads/master: 183f6371aac2a5496a8ef2b0b0a68562652c3cdb diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index f9d925451bfd..ef2d1e72fc07 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2378,6 +2378,13 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, /* Allocate without watermarks if the context allows */ if (alloc_flags & ALLOC_NO_WATERMARKS) { + /* + * Ignore mempolicies if ALLOC_NO_WATERMARKS on the grounds + * the allocation is high priority and these type of + * allocations are system rather than user orientated + */ + zonelist = node_zonelist(numa_node_id(), gfp_mask); + page = __alloc_pages_high_priority(gfp_mask, order, zonelist, high_zoneidx, nodemask, preferred_zone, migratetype);