The following changes since commit d78768171c2e1d8d047123e20f8c4ba9465dda10: Philippe Gerum (1): ipipe-2.6.32.7-x86-2.6-00 are available in the git repository at: git://git.kiszka.org/ipipe-2.6 queues/2.6.32-x86 Jan Kiszka (1): x86: Fix merge regression in unmask_IO_APIC_irq_desc arch/x86/kernel/apic/io_apic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) --------- x86: Fix merge regression in unmask_IO_APIC_irq_desc Proper IRQ unlocking at I-pipe level got lost during forward port to 2.6.32. That broke at least edge-triggered Linux IRQs. Signed-off-by: Jan Kiszka --- arch/x86/kernel/apic/io_apic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index c0235cf..d1674f6 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -639,6 +639,7 @@ static void unmask_IO_APIC_irq_desc(struct irq_desc *desc) else #endif __unmask_IO_APIC_irq(cfg); + ipipe_irq_unlock(desc->irq); spin_unlock_irqrestore(&ioapic_lock, flags); } -- 1.6.0.2