diff options
| author | Chen Yu | 2015-10-24 19:02:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2015-10-26 04:39:25 +0100 |
| commit | 49e4b84333f338d4f183f28f1f3c1131b9fb2b5a (patch) | |
| tree | ce656bcbb514d7d6004847e214f3c1c2fe03de2e /include/linux/acpi.h | |
| parent | Linux 4.3-rc7 (diff) | |
| download | kernel-qcow2-linux-49e4b84333f338d4f183f28f1f3c1131b9fb2b5a.tar.gz kernel-qcow2-linux-49e4b84333f338d4f183f28f1f3c1131b9fb2b5a.tar.xz kernel-qcow2-linux-49e4b84333f338d4f183f28f1f3c1131b9fb2b5a.zip | |
ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
Currently when the system is trying to uninstall the ACPI interrupt
handler, it uses acpi_gbl_FADT.sci_interrupt as the IRQ number.
However, the IRQ number that the ACPI interrupt handled is installed
for comes from acpi_gsi_to_irq() and that is the number that should
be used for the handler removal.
Fix this problem by using the mapped IRQ returned from acpi_gsi_to_irq()
as appropriate.
Cc: All applicable <stable@vger.kernel.org>
Acked-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 43856d19cf4d..1ae6ba06f9ac 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -193,6 +193,12 @@ int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base); void acpi_irq_stats_init(void); extern u32 acpi_irq_handled; extern u32 acpi_irq_not_handled; +extern unsigned int acpi_sci_irq; +#define INVALID_ACPI_IRQ ((unsigned)-1) +static inline bool acpi_sci_irq_valid(void) +{ + return acpi_sci_irq != INVALID_ACPI_IRQ; +} extern int sbf_port; extern unsigned long acpi_realmode_flags; |