diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2014-10-10 10:39:45 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-21 00:39:39 +0200 |
| commit | 437b75123ca5ee36897bfcd1272e96109bed3ea1 (patch) | |
| tree | 395e77701302e0f5e6083ec9546e9352ed0183e0 /drivers/acpi/acpica/evxface.c | |
| parent | f19f1a7e12b40c601a475c4fcb09dc0126d4bc51 (diff) | |
| download | linux-stable-437b75123ca5ee36897bfcd1272e96109bed3ea1.tar.gz linux-stable-437b75123ca5ee36897bfcd1272e96109bed3ea1.tar.bz2 linux-stable-437b75123ca5ee36897bfcd1272e96109bed3ea1.zip | |
ACPICA: Events: Reduce source code difference in acpi_install_gpe_handler().
There is a sanity check in ACPICA upstream, complaining mis-matched
interrupt type for originally enabled GPEs that are going to be dispatched
by OSPM handlers. This is only a warning message noting developers such
conflict between BIOS and OSPM. This patch ports this warning message from
ACPICA upstream to reduce source code difference between Linux and ACPICA
upstream.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/evxface.c')
| -rw-r--r-- | drivers/acpi/acpica/evxface.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c index 935fd7693d61..79b6ed204f44 100644 --- a/drivers/acpi/acpica/evxface.c +++ b/drivers/acpi/acpica/evxface.c @@ -795,8 +795,16 @@ acpi_install_gpe_handler(acpi_handle gpe_device, */ if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD) && gpe_event_info->runtime_count) { - handler->originally_enabled = 1; + handler->originally_enabled = TRUE; (void)acpi_ev_remove_gpe_reference(gpe_event_info); + + /* Sanity check of original type against new type */ + + if (type != + (u32)(gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK)) { + ACPI_WARNING((AE_INFO, + "GPE type mismatch (level/edge)")); + } } /* Install the handler */ |