summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-07 08:20:37 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-08 15:07:03 -0800
commit15f51136719699d7204eeeccd66849a4d90ae426 (patch)
treef8fdfc59a098dfbe6be4f30999476b58b219d476
parent26417d475709adeddf1eedfc05ad5129b3ba7da6 (diff)
downloadlinux-3.10-15f51136719699d7204eeeccd66849a4d90ae426.tar.gz
linux-3.10-15f51136719699d7204eeeccd66849a4d90ae426.tar.bz2
linux-3.10-15f51136719699d7204eeeccd66849a4d90ae426.zip
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>
-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 2b805d7ef31..8ae05ce1850 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;