The patch titled
acpi/acpica: do not check reference counters in acpi_ev_enable_gpe()
has been removed from the -mm tree. Its filename was
acpi-acpica-do-not-check-reference-counters-in-acpi_ev_enable_gpe.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: acpi/acpica: do not check reference counters in acpi_ev_enable_gpe()
From: Rafael J. Wysocki <rjw@xxxxxxx>
acpi_ev_enable_gpe() should enable the GPE at the hardware level
regardless of the value of the GPE's runtime reference counter.
There are only two callers of acpi_ev_enable_gpe(), acpi_enable_gpe() and
acpi_set_gpe(). The first one checks the GPE's runtime reference counter
itself and only calls acpi_ev_enable_gpe() if it's equal to one, and the
other one is supposed to enable the GPE unconditionally (if called with
ACPI_GPE_ENABLE).
This change fixes the problem in acpi_enable_wakeup_device() where the GPE
will not be enabled for wakeup if it's runtime reference counter is zero,
which is a regression from 2.6.33.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Reported-by: Robert Moore <robert.moore@xxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/acpica/evgpe.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff -puN drivers/acpi/acpica/evgpe.c~acpi-acpica-do-not-check-reference-counters-in-acpi_ev_enable_gpe drivers/acpi/acpica/evgpe.c
--- a/drivers/acpi/acpica/evgpe.c~acpi-acpica-do-not-check-reference-counters-in-acpi_ev_enable_gpe
+++ a/drivers/acpi/acpica/evgpe.c
@@ -117,19 +117,14 @@ acpi_status acpi_ev_enable_gpe(struct ac
if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- /* Mark wake-enabled or HW enable, or both */
-
- if (gpe_event_info->runtime_count) {
- /* Clear the GPE (of stale events), then enable it */
- status = acpi_hw_clear_gpe(gpe_event_info);
- if (ACPI_FAILURE(status))
- return_ACPI_STATUS(status);
-
- /* Enable the requested runtime GPE */
- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
- }
+ /* Clear the GPE (of stale events), then enable it */
+ status = acpi_hw_clear_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ return_ACPI_STATUS(status);
- return_ACPI_STATUS(AE_OK);
+ /* Enable the requested GPE */
+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
+ return_ACPI_STATUS(status);
}
/*******************************************************************************
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
linux-next.patch
ecryptfs-fix-oops-after-umount.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
