---

yaml
---
r: 320819
b: refs/heads/master
c: 5091b74
h: refs/heads/master
i:
  320817: 2eefb2c
  320815: f32dc24
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 072bb0aa5e062902968c5c1007bba332c7820cf4
+refs/heads/master: 5091b74a95d447e34530e713a8971450a45498b3

trunk/mm/slub.c

@@ -2281,11 +2281,11 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
 	}
 
 	page = c->page;
-	if (likely(!kmem_cache_debug(s)))
+	if (likely(!kmem_cache_debug(s) && pfmemalloc_match(page, gfpflags)))
 		goto load_freelist;
 
 	/* Only entered in the debug case */
-	if (!alloc_debug_processing(s, page, freelist, addr))
+	if (kmem_cache_debug(s) && !alloc_debug_processing(s, page, freelist, addr))
 		goto new_slab;	/* Slab failed checks. Next slab needed */
 
 	deactivate_slab(s, page, get_freepointer(s, freelist));
@@ -2337,8 +2337,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
 
 	object = c->freelist;
 	page = c->page;
-	if (unlikely(!object || !node_match(page, node) ||
-					!pfmemalloc_match(page, gfpflags)))
+	if (unlikely(!object || !node_match(page, node)))
 		object = __slab_alloc(s, gfpflags, node, addr, c);
 
 	else {