[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1463645512-29363-1-git-send-email-chris@chris-wilson.co.uk>
Date: Thu, 19 May 2016 09:11:52 +0100
From: Chris Wilson <chris@...is-wilson.co.uk>
To: "Rafael J . Wysocki" <rjw@...ysocki.net>
Cc: Chris Wilson <chris@...is-wilson.co.uk>,
Len Brown <lenb@...nel.org>, linux-acpi@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] acpi/battery: Correctly serialise with the pending async probe
async_synchronize_cookie() only serialises all tasks up to the specified
cookie, and importantly does not wait for the task corresponding with
the cookie. (This is so that it can be trivially used from inside the
async_func_t in order to serialise with all preceding tasks.) In order
to serialise with acpi_battery_init_async() we need to compensate and
pass in the next cookie instead.
The impact today is zero since performing an async_schedule() from inside
a module init function will trigger an async_synchronize_full() prior to
the module loader's completion. However, if the probe was moved to its
own unregistered async_domain, then the async_synchronize_cookie would
be replaced with an async_synchronize_full_domain.
Signed-off-by: Chris Wilson <chris@...is-wilson.co.uk>
Cc: "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: Len Brown <lenb@...nel.org>
Cc: linux-acpi@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
---
drivers/acpi/battery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index b719ab3090bb..ab234791a0ba 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1316,7 +1316,7 @@ static int __init acpi_battery_init(void)
static void __exit acpi_battery_exit(void)
{
- async_synchronize_cookie(async_cookie);
+ async_synchronize_cookie(async_cookie + 1);
acpi_bus_unregister_driver(&acpi_battery_driver);
#ifdef CONFIG_ACPI_PROCFS_POWER
acpi_unlock_battery_dir(acpi_battery_dir);
--
2.8.1
Powered by blists - more mailing lists