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>
This commit is contained in:
parent
26417d4757
commit
15f5113671
@ -579,13 +579,6 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
|
|||||||
goto err_free_cpumask;
|
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
|
* Do not start hotplugged CPUs now, but when they
|
||||||
* are onlined the first time
|
* are onlined the first time
|
||||||
|
Loading…
Reference in New Issue
Block a user