| commit | 5399b80762e49a543ace1da109537e89e758cea7 | |
| author | Thomas Gleixner <tglx@linutronix.de> | |
| Sun, 12 Aug 2007 15:46:34 +0000 (12 15:46 +0000) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 5 Nov 2007 17:56:06 +0000 (5 09:56 -0800) | ||
| tree | b042331a9dfd6926177bf429ec8df58aaf9a7b13 | treesnapshot (tar.gz zip) |
| parent | 564292ecbfb3231bcb9a75d80341967b5b833b97 | commitdiff |
genirq: cleanup mismerge artifact
patch 496634217e5671ed876a0348e9f5b7165e830b20 in mainline.
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>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
patch 496634217e5671ed876a0348e9f5b7165e830b20 in mainline.
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>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| kernel/irq/chip.c | diffblobblamehistory |