- lets make Lenovo special keys work

  https://bugzilla.kernel.org/show_bug.cgi?id=84381

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d4b603499b05f64e51b96e527678c26a94700ef8..561fe81d0a38159e4cbd2b0730454f5144661cf9 100644 (file)
--- 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 addcb36eb1fa6168c7af7adda7dfbeb6c3d51def..eaf4c5f20be0cad00379c236befbe7a8940f5021 100644 (file)
--- 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