]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 524c0c2) | patch
genirq: cleanup mismerge artifact
authorThomas Gleixner <tglx@linutronix.de>
Sun, 12 Aug 2007 15:46:34 +0000 (15:46 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 12 Aug 2007 18:05:45 +0000 (11:05 -0700)
commite9383112badd2be32f21c2e2a474619d5c078e66
treeb7614ffeca67d328ec70d9d886c4ae63ce225f44tree | snapshot
parent524c0c24a9bad93b0c8dda22e32e7c8354f7e412commit | diff
genirq: cleanup mismerge artifact

Commit bec1576a651e60b358064d6b97f9b1ccc7ffab8e: "genirq: Allow fasteoi
handler to retrigger disabled interrupts" was erroneously applied to
handle_level_irq().  This added the irq retrigger / resend functionality
to the level irq handler.

Revert the offending bits.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/irq/chip.c diff | blob | history
Linux Kernel Source Tree.