diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 17:49:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 17:49:08 +0200 |
| commit | c7e745c6de92a757ec525fbc9a74891651a5f1c6 (patch) | |
| tree | c91b5dbb44adea2b2353e1fc0195582328561151 /mm/slab.c | |
| parent | 688c91755dc3d3c03d8c67c1df13c02be258768e (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | linux-c7e745c6de92a757ec525fbc9a74891651a5f1c6.tar.gz linux-c7e745c6de92a757ec525fbc9a74891651a5f1c6.tar.xz | |
Merge commit 'v2.6.26-rc8' into core/softlockup
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c index 06236e4ddc1b..046607f05f3e 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3263,9 +3263,12 @@ retry: 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) { |