diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-20 10:18:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-20 10:18:44 -0700 |
| commit | fb65a7c091529bfffb1262515252c0d0f6241c5c (patch) | |
| tree | 021a043df0e0d328c509c0e8fb74429cbce006c7 /net | |
| parent | 175f9c1bba9b825d22b142d183c9e175488b260c (diff) | |
| download | linux-3.10-fb65a7c091529bfffb1262515252c0d0f6241c5c.tar.gz linux-3.10-fb65a7c091529bfffb1262515252c0d0f6241c5c.tar.bz2 linux-3.10-fb65a7c091529bfffb1262515252c0d0f6241c5c.zip | |
iucv: Fix bad merging.
Noticed by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/iucv/iucv.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index a598c738484..265b1b289a3 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c @@ -523,12 +523,8 @@ 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 +547,7 @@ 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 kfree(iucv_path_table); } |