aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAshok Raj <ashok.raj@intel.com>2006-03-28 17:04:00 -0500
committerLen Brown <len.brown@intel.com>2006-04-01 22:45:30 -0500
commiteefa27a93a0490902f33837ac86dbcf344b3aa29 (patch)
treeffb8e6f4d56045c679850f41d5c5808773b67a49 /drivers
parent683aa4012f53b2ada0f430487e05d37b0d94e90a (diff)
ACPI: Allow hot-add of ejected processor
acpi_eject_store() didn't trim processors, causing subsequent hot-add to fail. Signed-off-by: Ashok Raj <ashok.raj@intel.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/scan.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a0ab828b2cc5..95d5bc2acadd 100644
--- 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)
441 islockable = device->flags.lockable; 441 islockable = device->flags.lockable;
442 handle = device->handle; 442 handle = device->handle;
443 443
444 if (type == ACPI_TYPE_PROCESSOR) 444 result = acpi_bus_trim(device, 1);
445 result = acpi_bus_trim(device, 0);
446 else
447 result = acpi_bus_trim(device, 1);
448 445
449 if (!result) 446 if (!result)
450 result = acpi_eject_operation(handle, islockable); 447 result = acpi_eject_operation(handle, islockable);