Subject: [PATCH] PCI, ACPI: hold acpi_scan_lock during root bus hotplug During merging pci tree with pm/acpi tree, Linus noticed that we don't have same lock using patten about acpi pci root as acpiphp. Here apply same lock patten, and we need to change acpi_bus_hot_remove_device executing via acpi_os_hotplug_execute() as it also hold the lock in acpi_bus_hot_remove_device. That will make acpi_bus_hot_remove_device calling the same as other callers. Reported-by: Linus Torvalds Signed-off-by: Yinghai Lu --- drivers/acpi/pci_root.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -652,6 +652,7 @@ static void handle_root_bridge_insertion static void handle_root_bridge_removal(struct acpi_device *device) { + acpi_status status; struct acpi_eject_event *ej_event; ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL); @@ -667,7 +668,9 @@ static void handle_root_bridge_removal(s ej_event->device = device; ej_event->event = ACPI_NOTIFY_EJECT_REQUEST; - acpi_bus_hot_remove_device(ej_event); + status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event); + if (ACPI_FAILURE(status)) + kfree(ej_event); } static void _handle_hotplug_event_root(struct work_struct *work) @@ -682,8 +685,9 @@ static void _handle_hotplug_event_root(s handle = hp_work->handle; type = hp_work->type; - root = acpi_pci_find_root(handle); + acpi_scan_lock_acquire(); + root = acpi_pci_find_root(handle); acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); switch (type) { @@ -717,6 +721,7 @@ static void _handle_hotplug_event_root(s break; } + acpi_scan_lock_release(); kfree(hp_work); /* allocated in handle_hotplug_event_bridge */ kfree(buffer.pointer); }