Merge branches 'sched/devel', 'sched/cpu-hotplug', 'sched/cpusets' and 'sched/urgent...

[linux-2.6-omap-h63xx.git] / net / iucv / iucv.c

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index a598c73848401a215216a6f76ee3d5f0836f520e..d7b54b5bfa69954778a7eed398d23e06fa18633c 100644 (file)
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -497,7 +497,7 @@ static void iucv_setmask_up(void)
        /* Disable all cpu but the first in cpu_irq_cpumask. */
        cpumask = iucv_irq_cpumask;
        cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
-       for_each_cpu_mask(cpu, cpumask)
+       for_each_cpu_mask_nr(cpu, cpumask)
                smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
 }
 
@@ -523,12 +523,7 @@ static int iucv_enable(void)
        rc = -EIO;
        get_online_cpus();
        for_each_online_cpu(cpu)
-<<<<<<< HEAD:net/iucv/iucv.c
-               smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);
-=======
                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
-       preempt_enable();
->>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
        if (cpus_empty(iucv_buffer_cpumask))
                /* No cpu could declare an iucv buffer. */
                goto out_path;
@@ -551,13 +546,9 @@ out:
  */
 static void iucv_disable(void)
 {
-<<<<<<< HEAD:net/iucv/iucv.c
        get_online_cpus();
-       on_each_cpu(iucv_retrieve_cpu, NULL, 0, 1);
-       put_online_cpus();
-=======
        on_each_cpu(iucv_retrieve_cpu, NULL, 1);
->>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
+       put_online_cpus();
        kfree(iucv_path_table);
 }