|
@@ -349,12 +349,6 @@ static void mpol_rebind_nodemask(struct mempolicy *pol, const nodemask_t *nodes,
|
|
|
pol->v.nodes = tmp;
|
|
|
else
|
|
|
BUG();
|
|
|
-
|
|
|
- if (!node_isset(current->il_next, tmp)) {
|
|
|
- current->il_next = next_node_in(current->il_next, tmp);
|
|
|
- if (current->il_next >= MAX_NUMNODES)
|
|
|
- current->il_next = numa_node_id();
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
static void mpol_rebind_preferred(struct mempolicy *pol,
|
|
@@ -812,9 +806,8 @@ static long do_set_mempolicy(unsigned short mode, unsigned short flags,
|
|
|
}
|
|
|
old = current->mempolicy;
|
|
|
current->mempolicy = new;
|
|
|
- if (new && new->mode == MPOL_INTERLEAVE &&
|
|
|
- nodes_weight(new->v.nodes))
|
|
|
- current->il_next = first_node(new->v.nodes);
|
|
|
+ if (new && new->mode == MPOL_INTERLEAVE)
|
|
|
+ current->il_prev = MAX_NUMNODES-1;
|
|
|
task_unlock(current);
|
|
|
mpol_put(old);
|
|
|
ret = 0;
|
|
@@ -916,7 +909,7 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,
|
|
|
*policy = err;
|
|
|
} else if (pol == current->mempolicy &&
|
|
|
pol->mode == MPOL_INTERLEAVE) {
|
|
|
- *policy = current->il_next;
|
|
|
+ *policy = next_node_in(current->il_prev, pol->v.nodes);
|
|
|
} else {
|
|
|
err = -EINVAL;
|
|
|
goto out;
|
|
@@ -1697,14 +1690,13 @@ static struct zonelist *policy_zonelist(gfp_t gfp, struct mempolicy *policy,
|
|
|
/* Do dynamic interleaving for a process */
|
|
|
static unsigned interleave_nodes(struct mempolicy *policy)
|
|
|
{
|
|
|
- unsigned nid, next;
|
|
|
+ unsigned next;
|
|
|
struct task_struct *me = current;
|
|
|
|
|
|
- nid = me->il_next;
|
|
|
- next = next_node_in(nid, policy->v.nodes);
|
|
|
+ next = next_node_in(me->il_prev, policy->v.nodes);
|
|
|
if (next < MAX_NUMNODES)
|
|
|
- me->il_next = next;
|
|
|
- return nid;
|
|
|
+ me->il_prev = next;
|
|
|
+ return next;
|
|
|
}
|
|
|
|
|
|
/*
|