diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:00:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:00:26 -0400 |
| commit | 198bb971e256e4167e45e7df643c13ea66f67e3a (patch) | |
| tree | 85b8b2bf6cc78bf0e53a2187ed5796f076922334 /mm/slab.c | |
| parent | ea71a546706dfdad72462624394e1e472c6bf34f (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 5 |
1 files changed, 4 insertions, 1 deletions
| @@ -3263,9 +3263,12 @@ retry: | |||
| 3263 | 3263 | ||
| 3264 | if (cpuset_zone_allowed_hardwall(zone, flags) && | 3264 | if (cpuset_zone_allowed_hardwall(zone, flags) && |
| 3265 | cache->nodelists[nid] && | 3265 | cache->nodelists[nid] && |
| 3266 | cache->nodelists[nid]->free_objects) | 3266 | cache->nodelists[nid]->free_objects) { |
| 3267 | obj = ____cache_alloc_node(cache, | 3267 | obj = ____cache_alloc_node(cache, |
| 3268 | flags | GFP_THISNODE, nid); | 3268 | flags | GFP_THISNODE, nid); |
| 3269 | if (obj) | ||
| 3270 | break; | ||
| 3271 | } | ||
| 3269 | } | 3272 | } |
| 3270 | 3273 | ||
| 3271 | if (!obj) { | 3274 | if (!obj) { |
