From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>,
Shaohua Li <shaohua.li@intel.com>,
Len Brown <len.brown@intel.com>
Subject: [PATCH 04/12] ACPI: fixes a false alarm from lockdep
Date: Tue, 06 Apr 2010 03:06:15 -0400 [thread overview]
Message-ID: <bc73675b99fd9850dd914be01d71af99c5d2a1ae.1270537380.git.len.brown@intel.com> (raw)
In-Reply-To: <1270537583-8756-1-git-send-email-lenb@kernel.org>
In-Reply-To: <dadf28a10c3eb29421837a2e413ab869ebd9e168.1270537380.git.len.brown@intel.com>
From: Zhang Rui <rui.zhang@intel.com>
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>
---
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 8e6d866..900da68 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) {
--
1.6.0.6
next prev parent reply other threads:[~2010-04-06 7:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-06 7:06 ACPI patches for 2.6.34-rc3 Len Brown
2010-04-06 7:06 ` [PATCH 01/12] ACPI: EC: Allow multibyte access to EC Len Brown
2010-04-06 7:06 ` [PATCH 02/12] ACPI / PM: Move ACPI video resume to a PM notifier Len Brown
2010-04-06 18:55 ` Rafael J. Wysocki
2010-04-06 21:07 ` Len Brown
2010-04-06 7:06 ` [PATCH 03/12] ACPI dock: support multiple ACPI dock devices Len Brown
2010-04-06 7:06 ` Len Brown [this message]
2010-04-06 7:06 ` [PATCH 05/12] ACPI / ACPICA: Do not check reference counters in acpi_ev_enable_gpe() Len Brown
2010-04-06 7:06 ` [PATCH 06/12] ACPI: use _HID when supplied by root-level devices Len Brown
2010-04-06 7:06 ` [PATCH 07/12] ACPI: NUMA: map pxms to low node ids Len Brown
2010-04-06 7:06 ` [PATCH 08/12] ACPI: Don't send KEY_UNKNOWN for random video notifications Len Brown
2010-04-06 7:06 ` [PATCH 09/12] PNPACPI: truncate _CRS windows with _LEN > _MAX - _MIN + 1 Len Brown
2010-04-06 7:06 ` [PATCH 10/12] ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n Len Brown
2010-04-06 7:06 ` [PATCH 11/12] ACPI: battery drivers should call power_supply_changed() Len Brown
2010-04-06 7:06 ` [PATCH 12/12] ACPI: Reduce ACPI resource conflict message to KERN_WARNING, printk cleanup Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bc73675b99fd9850dd914be01d71af99c5d2a1ae.1270537380.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=shaohua.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox