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

Commit 15f51136 authored by Yinghai Lu's avatar Yinghai Lu Committed by Greg Kroah-Hartman
Browse files

ACPI: remove duplicated lines of merging problems with acpi_processor_add 



Those lines have two copies.

Not sure how it could happen, looks like git problem.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26417d47

drivers/acpi/processor_driver.c

+0 −7
Original line number Diff line number Diff line
@@ -579,13 +579,6 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) 
		goto err_free_cpumask;

	}



	/*

	 * Do not start hotplugged CPUs now, but when they

	 * are onlined the first time

	 */

	if (pr->flags.need_hotplug_init)

		return 0;



	/*

	 * Do not start hotplugged CPUs now, but when they

	 * are onlined the first time