Pull cpu-hotplug into release branch

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a0ab828b2cc5fc589335fe9ffe1c1462985288eb..95d5bc2acadd3179c73ce8a6e04c84145697ad83 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -441,10 +441,7 @@ acpi_eject_store(struct acpi_device *device, const char *buf, size_t count)
        islockable = device->flags.lockable;
        handle = device->handle;
 
-       if (type == ACPI_TYPE_PROCESSOR)
-               result = acpi_bus_trim(device, 0);
-       else
-               result = acpi_bus_trim(device, 1);
+       result = acpi_bus_trim(device, 1);
 
        if (!result)
                result = acpi_eject_operation(handle, islockable);