summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-24 12:28:34 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 12:28:34 -0700
commit01424961e621737c638e489b6a0b5e6602b02612 (patch)
treeae51380febe42e40d09375648b0d379325b905a7 /mm
parentbc86120a85ebf553180946e8854d1993f074e9f5 (diff)
downloadlinux-3.10-01424961e621737c638e489b6a0b5e6602b02612.tar.gz
linux-3.10-01424961e621737c638e489b6a0b5e6602b02612.tar.bz2
linux-3.10-01424961e621737c638e489b6a0b5e6602b02612.zip
[PATCH] mempolicy.c GFP fix
zonelist_policy() forgot to mask non-zone bits from gfp when comparing zone number with policy_zone. ACKed-by: Andi Kleen <ak@suse.de> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/mempolicy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index a3b44a671ce..08c41da429c 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -661,7 +661,7 @@ static struct zonelist *zonelist_policy(unsigned int __nocast gfp, struct mempol
case MPOL_BIND:
/* Lower zones don't get a policy applied */
/* Careful: current->mems_allowed might have moved */
- if (gfp >= policy_zone)
+ if ((gfp & GFP_ZONEMASK) >= policy_zone)
if (cpuset_zonelist_valid_mems_allowed(policy->v.zonelist))
return policy->v.zonelist;
/*FALL THROUGH*/