Merge branch 'linus' into cpus4096-for-linus
Ingo Molnar [Mon, 21 Jul 2008 15:19:50 +0000 (17:19 +0200)]
Conflicts:

net/sunrpc/svc.c

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

1  2 
net/core/dev.c
net/iucv/iucv.c
net/sunrpc/svc.c

diff --cc net/core/dev.c
Simple merge
diff --cc net/iucv/iucv.c
Simple merge
@@@ -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:
        {