diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-06 01:55:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-06 01:55:06 -0400 |
| commit | ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05 (patch) | |
| tree | c28975d7daf6d8a3aa23afe8f42837b71105b269 /drivers/acpi/acpi_processor.c | |
| parent | 8c6e549a447c51f4f8c0ba7f1e444469f75a354a (diff) | |
| parent | e041e328c4b41e1db79bfe5ba9992c2ed771ad19 (diff) | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/acpi_processor.c')
| -rw-r--r-- | drivers/acpi/acpi_processor.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index b06f5f55ada9..52c81c49cc7d 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c | |||
| @@ -405,7 +405,6 @@ static int acpi_processor_add(struct acpi_device *device, | |||
| 405 | goto err; | 405 | goto err; |
| 406 | 406 | ||
| 407 | pr->dev = dev; | 407 | pr->dev = dev; |
| 408 | dev->offline = pr->flags.need_hotplug_init; | ||
| 409 | 408 | ||
| 410 | /* Trigger the processor driver's .probe() if present. */ | 409 | /* Trigger the processor driver's .probe() if present. */ |
| 411 | if (device_attach(dev) >= 0) | 410 | if (device_attach(dev) >= 0) |