From 8848d1663f3a9c57517eeb9482c5cdcec6638d5b Mon Sep 17 00:00:00 2001 From: Andrzej Zawadzki Date: Sun, 9 Nov 2014 22:16:21 +0100 Subject: [PATCH] - lets make Lenovo special keys work https://bugzilla.kernel.org/show_bug.cgi?id=84381 --- kernel-small_fixes.patch | 27 +++++++++++++++++++++++++++ kernel.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index d4b60349..561fe81d 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -26,3 +26,30 @@ exit fi done +--- a/arch/x86/kernel/acpi/boot.c ++++ b/arch/x86/kernel/acpi/boot.c +@@ -604,14 +604,18 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) + + int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) + { +- int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK); ++ int irq; + +- if (irq >= 0) { ++ if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) { ++ *irqp = gsi; ++ } else { ++ irq = mp_map_gsi_to_irq(gsi, ++ IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK); ++ if (irq < 0) ++ return -1; + *irqp = irq; +- return 0; + } +- +- return -1; ++ return 0; + } + EXPORT_SYMBOL_GPL(acpi_gsi_to_irq); + +-- diff --git a/kernel.spec b/kernel.spec index addcb36e..eaf4c5f2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,7 +68,7 @@ %define have_pcmcia 0 %endif -%define rel 1 +%define rel 2 %define basever 3.17 %define postver .2 -- 2.44.0