* [PATCH 2/2] ACPI: fixes a false alarm from lockdep
@ 2010-03-22 7:48 Zhang Rui
2010-03-23 4:18 ` Len Brown
0 siblings, 1 reply; 2+ messages in thread
From: Zhang Rui @ 2010-03-22 7:48 UTC (permalink / raw)
To: Brown, Len
Cc: linux-acpi@vger.kernel.org, Andrew Morton, Li, Shaohua,
Zhang, Rui
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>
---
drivers/acpi/osl.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Index: linux-2.6/drivers/acpi/osl.c
===================================================================
--- linux-2.6.orig/drivers/acpi/osl.c 2010-03-19 09:34:33.000000000 +0800
+++ linux-2.6/drivers/acpi/osl.c 2010-03-19 09:36:00.000000000 +0800
@@ -758,7 +758,14 @@
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) {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-23 4:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-22 7:48 [PATCH 2/2] ACPI: fixes a false alarm from lockdep Zhang Rui
2010-03-23 4:18 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox