aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/processor_driver.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-17 15:08:20 -0800
committerTony Lindgren <tony@atomide.com>2012-02-17 15:08:20 -0800
commitb0ee4e394009f02a1d1b166091a19e8b842b4ea4 (patch)
tree75e6df725e5402ed6fe9d78f23bf5cf45cfdf9d9 /drivers/acpi/processor_driver.c
parentabe763f2bccbc592d33a3a9c334acaefea022c0a (diff)
parent03e4fd6eb25e6b46536ecdb0d1b7d33d46b15480 (diff)
Merge branch 'for_3.3/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'drivers/acpi/processor_driver.c')
-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 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)
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;