Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198222
b: refs/heads/master
c: 6eb27e1
h: refs/heads/master
v: v3
  • Loading branch information
Bob Liu authored and Linus Torvalds committed May 25, 2010
1 parent 537c94f commit 7b0a37f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d556294d5b27fb12f18be7495af45b6156a409e
refs/heads/master: 6eb27e1fdf5781719a3d2e90e6c89fa012135c62
4 changes: 1 addition & 3 deletions trunk/mm/mempolicy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1441,15 +1441,13 @@ static struct zonelist *policy_zonelist(gfp_t gfp, struct mempolicy *policy)
/*
* Normally, MPOL_BIND allocations are node-local within the
* allowed nodemask. However, if __GFP_THISNODE is set and the
* current node is part of the mask, we use the zonelist for
* current node isn't part of the mask, we use the zonelist for
* the first node in the mask instead.
*/
if (unlikely(gfp & __GFP_THISNODE) &&
unlikely(!node_isset(nd, policy->v.nodes)))
nd = first_node(policy->v.nodes);
break;
case MPOL_INTERLEAVE: /* should not happen */
break;
default:
BUG();
}
Expand Down

0 comments on commit 7b0a37f

Please sign in to comment.