From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 7 Feb 2012 16:20:37 +0000 (-0800)
Subject: ACPI: remove duplicated lines of merging problems with acpi_processor_add
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15f51136719699d7204eeeccd66849a4d90ae426;p=linux-beck.git

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: Yinghai Lu <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 2b805d7ef317..8ae05ce18500 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -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