From: Andrew Morton Cc: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton --- mm/mempolicy.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff -puN mm/mempolicy.c~implement-sys_-do_-layering-in-the-memory-policy-layer-tidy mm/mempolicy.c --- devel/mm/mempolicy.c~implement-sys_-do_-layering-in-the-memory-policy-layer-tidy 2005-10-14 01:00:48.000000000 -0700 +++ devel-akpm/mm/mempolicy.c 2005-10-14 01:00:48.000000000 -0700 @@ -345,7 +345,7 @@ static int contextualize_policy(int mode /* Update current mems_allowed */ cpuset_update_current_mems_allowed(); /* Ignore nodes not set in current->mems_allowed */ - cpuset_restrict_to_mems_allowed(nodes->bits); + cpuset_restrict_to_mems_allowed(nodes->bits); return mpol_check_policy(mode, nodes); } @@ -415,7 +415,8 @@ static void get_zonemask(struct mempolic switch (p->policy) { case MPOL_BIND: for (i = 0; p->v.zonelist->zones[i]; i++) - node_set(p->v.zonelist->zones[i]->zone_pgdat->node_id, *nodes); + node_set(p->v.zonelist->zones[i]->zone_pgdat->node_id, + *nodes); break; case MPOL_DEFAULT: break; @@ -618,7 +619,7 @@ asmlinkage long sys_get_mempolicy(int __ return err; if (policy && put_user(pval, policy)) - return -EFAULT; + return -EFAULT; if (nmask) err = copy_nodes_to_user(nmask, maxnode, &nodes); @@ -713,7 +714,7 @@ get_vma_policy(struct task_struct *task, if (vma) { if (vma->vm_ops && vma->vm_ops->get_policy) - pol = vma->vm_ops->get_policy(vma, addr); + pol = vma->vm_ops->get_policy(vma, addr); else if (vma->vm_policy && vma->vm_policy->policy != MPOL_DEFAULT) pol = vma->vm_policy; _