lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 7 Apr 2015 22:34:03 +0800 From: Jiang Liu <jiang.liu@...ux.intel.com> To: jim876@...all.nl, "Rafael J. Wysocki" <rjw@...ysocki.net>, Len Brown <len.brown@...el.com>, Pavel Machek <pavel@....cz>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, x86@...nel.org Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Jiang Liu <jiang.liu@...ux.intel.com>, linux-pm@...r.kernel.org Subject: [PATCH] x86/ACPI: Fix regression caused by 16ee7b3dcc56 Hi Jim, Could you please help to test this patch against v4.0-rc6? Thanks! Gerry Signed-off-by: Jiang Liu <jiang.liu@...ux.intel.com> --- arch/x86/kernel/acpi/boot.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 803b684676ff..f7f1fe7cd1b0 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -403,10 +403,14 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) { - int irq, node; + int i, irq, node; - if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) - return gsi; + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) { + for (i = 0; i < nr_legacy_irqs(); i++) + if (isa_irq_to_gsi[i] == gsi) + return i; + return -1; + } trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1; polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists