Skip to content

Commit

Permalink
ACPI: remove duplicated lines of merging problems with acpi_processor…
Browse files Browse the repository at this point in the history
…_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>
  • Loading branch information
Yinghai Lu authored and Greg Kroah-Hartman committed Feb 8, 2012
1 parent 26417d4 commit 15f5113
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/acpi/processor_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 15f5113

Please sign in to comment.