diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-03-30 01:07:03 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-04 13:34:27 -0700 |
| commit | 9a0a91bb56d2915cdb8585717de38376ad20fef9 (patch) | |
| tree | 207c5f72fc4f4edc623db1e4440c5325a17ba120 /include/linux/acpi.h | |
| parent | 2c2df8418ac7908eec4558407b83f16739006c54 (diff) | |
| download | linux-9a0a91bb56d2915cdb8585717de38376ad20fef9.tar.gz linux-9a0a91bb56d2915cdb8585717de38376ad20fef9.tar.bz2 linux-9a0a91bb56d2915cdb8585717de38376ad20fef9.zip | |
x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq
In perverse acpi implementations the isa irqs are not identity mapped
to the first 16 gsi. Furthermore at least the extended interrupt
resource capability may return gsi's and not isa irqs. So since
what we get from acpi is a gsi teach acpi_get_overrride_irq to
operate on a gsi instead of an isa_irq.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <1269936436-7039-2-git-send-email-ebiederm@xmission.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 7a937dabcc4a..3da73f5f0ae9 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -119,9 +119,9 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi); #ifdef CONFIG_X86_IO_APIC -extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity); +extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity); #else -#define acpi_get_override_irq(bus, trigger, polarity) (-1) +#define acpi_get_override_irq(gsi, trigger, polarity) (-1) #endif /* * This function undoes the effect of one call to acpi_register_gsi(). |