iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iucv: Fix bad merging.

Browse Source 
Noticed by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-07-20 10:18:44 -07:00
parent 175f9c1bba
commit fb65a7c091
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/iucv/iucv.c
View File

@ -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);
}