git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 963c652) | 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)
commit496634217e5671ed876a0348e9f5b7165e830b20
treeb7614ffeca67d328ec70d9d886c4ae63ce225f44tree | snapshot
parent963c6527e0a0e285736ad482b8142d098f9c2288commit | diff
genirq: cleanup mismerge artifact

Commit 5a43a066b11ac2fe84cf67307f20b83bea390f83: "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
Full containers within linux kernel