diff options
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 324b0991943e..15d677e6cee9 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -620,15 +620,16 @@ void __init acpi_early_init(void) | |||
| 620 | 620 | ||
| 621 | #ifdef CONFIG_X86 | 621 | #ifdef CONFIG_X86 |
| 622 | if (!acpi_ioapic) { | 622 | if (!acpi_ioapic) { |
| 623 | extern acpi_interrupt_flags acpi_sci_flags; | 623 | extern u8 acpi_sci_flags; |
| 624 | 624 | ||
| 625 | /* compatible (0) means level (3) */ | 625 | /* compatible (0) means level (3) */ |
| 626 | if (acpi_sci_flags.trigger == 0) | 626 | if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { |
| 627 | acpi_sci_flags.trigger = 3; | 627 | acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; |
| 628 | 628 | acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; | |
| 629 | } | ||
| 629 | /* Set PIC-mode SCI trigger type */ | 630 | /* Set PIC-mode SCI trigger type */ |
| 630 | acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, | 631 | acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, |
| 631 | acpi_sci_flags.trigger); | 632 | (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); |
| 632 | } else { | 633 | } else { |
| 633 | extern int acpi_sci_override_gsi; | 634 | extern int acpi_sci_override_gsi; |
| 634 | /* | 635 | /* |