From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 21 Jul 2008 15:19:50 +0000 (+0200)
Subject: Merge branch 'linus' into cpus4096-for-linus
X-Git-Tag: v2.6.27-rc1~848^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0;p=linux-2.6

Merge branch 'linus' into cpus4096-for-linus

Conflicts:

	net/sunrpc/svc.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0
diff --cc net/sunrpc/svc.c
index 083d126881,5a32cb7c4b..835d274130
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@@ -307,18 -307,11 +307,12 @@@ svc_pool_map_set_cpumask(struct task_st
  	 */
  	BUG_ON(m->count == 0);
  
- 	switch (m->mode)
- 	{
- 	default:
- 		return 0;
+ 	switch (m->mode) {
  	case SVC_POOL_PERCPU:
  	{
- 		unsigned int cpu = m->pool_to[pidx];
- 		cpumask_of_cpu_ptr(cpumask, cpu);
- 
- 		*oldmask = current->cpus_allowed;
- 		set_cpus_allowed_ptr(current, cpumask);
- 		return 1;
 -		set_cpus_allowed_ptr(task, &cpumask_of_cpu(node));
++		cpumask_of_cpu_ptr(cpumask, node);
++		set_cpus_allowed_ptr(task, cpumask);
+ 		break;
  	}
  	case SVC_POOL_PERNODE:
  	{