mm/vmalloc.c: fix memory ordering bug

[mirror_ubuntu-bionic-kernel.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 386bbed76e945c32d758f4e9b0f396ef0a4714af..765c5884d03d46b2b4a41b977d5cf2dfe2d878b1 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1665,7 +1665,8 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags,
 
                        n = get_node(s, zone_to_nid(zone));
 
-                       if (n && cpuset_zone_allowed_hardwall(zone, flags) &&
+                       if (n && cpuset_zone_allowed(zone,
+                                                    flags | __GFP_HARDWALL) &&
                                        n->nr_partial > s->min_partial) {
                                object = get_partial_node(s, n, c, flags);
                                if (object) {