diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2010-03-22 08:48:54 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-03-23 05:17:25 +0100 |
| commit | bc73675b99fd9850dd914be01d71af99c5d2a1ae (patch) | |
| tree | 4d3d0a5d8a1708c8e4daa610009150656437ce1c /drivers/acpi | |
| parent | ACPI dock: support multiple ACPI dock devices (diff) | |
| download | linux-bc73675b99fd9850dd914be01d71af99c5d2a1ae.tar.xz linux-bc73675b99fd9850dd914be01d71af99c5d2a1ae.zip | |
ACPI: fixes a false alarm from lockdep
fixes a false alarm from lockdep, as acpi hotplug workqueue waits other
workqueues.
http://bugzilla.kernel.org/show_bug.cgi?id=14553
https://bugzilla.kernel.org/show_bug.cgi?id=15521
Original-patch-from: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/osl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 8e6d8665f0ae..900da68fbb5e 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -758,7 +758,14 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, queue = hp ? kacpi_hotplug_wq : (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq); dpc->wait = hp ? 1 : 0; - INIT_WORK(&dpc->work, acpi_os_execute_deferred); + + if (queue == kacpi_hotplug_wq) + INIT_WORK(&dpc->work, acpi_os_execute_deferred); + else if (queue == kacpi_notify_wq) + INIT_WORK(&dpc->work, acpi_os_execute_deferred); + else + INIT_WORK(&dpc->work, acpi_os_execute_deferred); + ret = queue_work(queue, &dpc->work); if (!ret) { |