From 7b0a37fa895813326fa2623ad470208cda8add70 Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Mon, 24 May 2010 14:32:00 -0700 Subject: [PATCH] --- yaml --- r: 198222 b: refs/heads/master c: 6eb27e1fdf5781719a3d2e90e6c89fa012135c62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mempolicy.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9c9325632ab5..babff19fc0ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d556294d5b27fb12f18be7495af45b6156a409e +refs/heads/master: 6eb27e1fdf5781719a3d2e90e6c89fa012135c62 diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index ad500f3b12bf..d97355b744ab 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -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(); }