summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-20 10:00:01 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-03-20 10:00:01 +1100
commit1ae061a754c0a32ffef084208d8985ee296c1da2 (patch)
tree2da2e7b35af95b7316a23bea030c66d1cd29d242 /net
parent5f053b2212c9ac83f78ea64f53ac4e78027e8dbb (diff)
parentc7b16712f76b93eaefb4eb71b7af2a64203b5176 (diff)
Merge commit 'cpus4096/auto-cpus4096-next'
Conflicts: arch/x86/kernel/cpu/common.c
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/svc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index c51fed4d1af1..3bdd5bffaca8 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -317,8 +317,7 @@ svc_pool_map_set_cpumask(struct task_struct *task, unsigned int pidx)
}
case SVC_POOL_PERNODE:
{
- node_to_cpumask_ptr(nodecpumask, node);
- set_cpus_allowed_ptr(task, nodecpumask);
+ set_cpus_allowed_ptr(task, cpumask_of_node(node));
break;
}
}