diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 20:38:22 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 20:38:22 -0400 |
| commit | 94aca80897501f994c795cffc458ecd0404377c7 (patch) | |
| tree | 312f96755c4e7ab4c50766aea35c9e7aa2ebe015 /drivers/acpi/acpi_processor.c | |
| parent | 03c1b4e8e560455a2634a76998883a22f1a01207 (diff) | |
| parent | 368b69a5b010cb00fc9ea04d588cff69af1a1359 (diff) | |
Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso
Resolved Conflicts:
arch/x86/vdso/vdso32-setup.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
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) |