diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-02-07 11:20:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 17:31:35 -0500 |
commit | 59c1204d464075fcb5d02e7daa6b23782dd4a088 (patch) | |
tree | 8d35307db2b021ccfe56ab7986daf81927f2dc18 /drivers | |
parent | 84f8bf38b9368add916e7c335b6b94a7ae927cb1 (diff) |
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')
-rw-r--r-- | drivers/acpi/processor_driver.c | 7 |
1 files changed, 0 insertions, 7 deletions
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 | |||
@@ -586,13 +586,6 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) | |||
586 | if (pr->flags.need_hotplug_init) | 586 | if (pr->flags.need_hotplug_init) |
587 | return 0; | 587 | return 0; |
588 | 588 | ||
589 | /* | ||
590 | * Do not start hotplugged CPUs now, but when they | ||
591 | * are onlined the first time | ||
592 | */ | ||
593 | if (pr->flags.need_hotplug_init) | ||
594 | return 0; | ||
595 | |||
596 | result = acpi_processor_start(pr); | 589 | result = acpi_processor_start(pr); |
597 | if (result) | 590 | if (result) |
598 | goto err_remove_sysfs; | 591 | goto err_remove_sysfs; |