diff options
author | Len Brown <len.brown@intel.com> | 2005-12-28 02:43:51 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-12-28 02:50:44 -0500 |
commit | cb654695f6b912cef7cb3271665b6ee0d416124c (patch) | |
tree | 3aa96d52b12f81837d8a669099a4a7ac7807c8af /arch/i386/kernel/mpparse.c | |
parent | 28f55ebce5bd2fceec8adc7c8860953d3e4532a8 (diff) | |
download | kernel_samsung_espresso10-cb654695f6b912cef7cb3271665b6ee0d416124c.zip kernel_samsung_espresso10-cb654695f6b912cef7cb3271665b6ee0d416124c.tar.gz kernel_samsung_espresso10-cb654695f6b912cef7cb3271665b6ee0d416124c.tar.bz2 |
[ACPI] acpi_register_gsi() fix needed for ACPICA 20051021
Use the #define for ACPI_LEVEL_SENSITIVE instead of assuming
non-zero, because ACPICA 20051021 changes its value to zero.
Also, use uniform variable names:
edge_level -> triggering
active_high_low -> polarity
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/mpparse.c')
-rw-r--r-- | arch/i386/kernel/mpparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c index 1ca5269..d7cede8 100644 --- a/arch/i386/kernel/mpparse.c +++ b/arch/i386/kernel/mpparse.c @@ -1070,7 +1070,7 @@ void __init mp_config_acpi_legacy_irqs (void) #define MAX_GSI_NUM 4096 -int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) +int mp_register_gsi (u32 gsi, int triggering, int polarity) { int ioapic = -1; int ioapic_pin = 0; @@ -1119,7 +1119,7 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit); - if (edge_level) { + if (triggering == ACPI_LEVEL_SENSITIVE) { /* * For PCI devices assign IRQs in order, avoiding gaps * due to unused I/O APIC pins. @@ -1141,8 +1141,8 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) } io_apic_set_pci_routing(ioapic, ioapic_pin, gsi, - edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1, - active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1); + triggering == ACPI_EDGE_SENSITIVE ? 0 : 1, + polarity == ACPI_ACTIVE_HIGH ? 0 : 1); return gsi; } |