Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb65a7c0 authored by David S. Miller's avatar David S. Miller
Browse files

iucv: Fix bad merging. 



Noticed by Stephen Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 175f9c1b

net/iucv/iucv.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -523,12 +523,8 @@ static int iucv_enable(void) 
	rc = -EIO;

	rc = -EIO;

	get_online_cpus();

	get_online_cpus();

	for_each_online_cpu(cpu)

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

		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);

	preempt_enable();

	preempt_enable();

>>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c

	if (cpus_empty(iucv_buffer_cpumask))

	if (cpus_empty(iucv_buffer_cpumask))

		/* No cpu could declare an iucv buffer. */

		/* No cpu could declare an iucv buffer. */

		goto out_path;

		goto out_path;
@@ -551,13 +547,7 @@ static int iucv_enable(void) 
 */

 */

static void iucv_disable(void)

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

	on_each_cpu(iucv_retrieve_cpu, NULL, 1);

>>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c

	kfree(iucv_path_table);

	kfree(iucv_path_table);

}

}