summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-07 08:20:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-07 14:31:35 -0800
commit59c1204d464075fcb5d02e7daa6b23782dd4a088 (patch)
tree8d35307db2b021ccfe56ab7986daf81927f2dc18 /drivers/acpi
parent84f8bf38b9368add916e7c335b6b94a7ae927cb1 (diff)
downloadop-kernel-dev-59c1204d464075fcb5d02e7daa6b23782dd4a088.zip
op-kernel-dev-59c1204d464075fcb5d02e7daa6b23782dd4a088.tar.gz
ACPI: remove duplicated lines of merging problems with acpi_processor_add
Those lines have two copies. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_driver.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 2b805d7..8ae05ce 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -586,13 +586,6 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
if (pr->flags.need_hotplug_init)
return 0;
- /*
- * Do not start hotplugged CPUs now, but when they
- * are onlined the first time
- */
- if (pr->flags.need_hotplug_init)
- return 0;
-
result = acpi_processor_start(pr);
if (result)
goto err_remove_sysfs;
OpenPOWER on IntegriCloud