Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Conflicts:

	arch/x86/include/asm/topology.h
	drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).

1 files changed, 1 insertions, 2 deletions

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index bb507e2bb94d..7dc0524bb727 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;
         }
         }