From: Linus Torvalds Date: Sat, 11 Apr 2009 19:45:20 +0000 (-0700) Subject: Revert "ACPI battery: fix async boot oops" X-Git-Tag: firefly_0821_release~14540 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b0cbc861a3c05e634520b049b5cc27ad6febb51f;p=firefly-linux-kernel-4.4.55.git Revert "ACPI battery: fix async boot oops" This reverts commit 5d38258ec026921a7b266f4047ebeaa75db358e5, since the underlying problem got fixed properly in the previous commit ("async: Fix module loading async-work regression"). Cc: Arkadiusz Miskiewicz Cc: Vegard Nossum Cc: Len Brown Signed-off-by: Linus Torvalds --- diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 3c7d8942f23b..b0de6312919a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -903,7 +903,7 @@ static struct acpi_driver acpi_battery_driver = { }, }; -static void acpi_battery_init_async(void *unused, async_cookie_t cookie) +static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) { if (acpi_disabled) return;