Commit bc73675b authored Mar 22, 2010 by Zhang Rui Committed by Len Brown Mar 23, 2010

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>

parent 1ee4d61f

drivers/acpi/osl.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -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;

		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) {