diff --git a/[refs] b/[refs] index 38792103f248..d5b775105246 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62a8efe632be1815b544845db643f1fcd9afcfb0 +refs/heads/master: 481c5346d0981940ee63037eb53e4e37b0735c10 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 06236e4ddc1b..046607f05f3e 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3263,9 +3263,12 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) if (cpuset_zone_allowed_hardwall(zone, flags) && cache->nodelists[nid] && - cache->nodelists[nid]->free_objects) + cache->nodelists[nid]->free_objects) { obj = ____cache_alloc_node(cache, flags | GFP_THISNODE, nid); + if (obj) + break; + } } if (!obj) {