diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /mm/mempolicy.c | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'mm/mempolicy.c')
| -rw-r--r-- | mm/mempolicy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index f969da5dd8a2..c1002c68d617 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -1588,7 +1588,7 @@ unsigned slab_node(struct mempolicy *policy) | |||
| 1588 | (void)first_zones_zonelist(zonelist, highest_zoneidx, | 1588 | (void)first_zones_zonelist(zonelist, highest_zoneidx, |
| 1589 | &policy->v.nodes, | 1589 | &policy->v.nodes, |
| 1590 | &zone); | 1590 | &zone); |
| 1591 | return zone->node; | 1591 | return zone ? zone->node : numa_node_id(); |
| 1592 | } | 1592 | } |
| 1593 | 1593 | ||
| 1594 | default: | 1594 | default: |