diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-09 09:50:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-09 17:07:11 +0100 |
| commit | ca4b2df651a098a716e8cd8ebba79ba329e3dcc3 (patch) | |
| tree | 0aa7f067fef0e7de075e7bd9dce2e81795e93e44 /arch/x86/kernel/acpi/boot.c | |
| parent | 59c6f278bdeea4147e8be92a3ed50a9907e60088 (diff) | |
| parent | b0b6e86846093c5f8820386bc01515f857dd8faa (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 8a5abaa7d453..931ced8ca345 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -454,6 +454,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK; mp_override_legacy_irq(bus_irq, polarity, trigger, gsi); + acpi_penalize_sci_irq(bus_irq, trigger, polarity); /* * stash over-ride to indicate we've been here |