Attachment 192481 Details for Bug 245247 – patch 1 / 3 - genirq-cleanup-mismerge-artifact

[patch] patch 1 / 3 - genirq-cleanup-mismerge-artifact

genirq-cleanup-mismerge-artifact.patch (text/plain), 1.07 KB, created by Luis Claudio R. Goncalves on 2007-09-11 13:29:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luis Claudio R. Goncalves

Created: 2007-09-11 13:29:38 UTC

Size: 1.07 KB

patch

obsolete

>
>commit 5a43a066b11ac2fe84cf67307f20b83bea390f83
>genirq: Allow fasteoi handler to retrigger disabled interrupts
>
>was erroneously applied to handle_level_irq(). This adds the irq
>retrigger / resend functionality to the level irq handler.
>
>Revert the offending bits.
>
>Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
>
>---
> kernel/irq/chip.c |    5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
>Index: linux-2.6/kernel/irq/chip.c
>===================================================================
>--- linux-2.6.orig/kernel/irq/chip.c	2007-08-12 17:18:04.000000000 +0200
>+++ linux-2.6/kernel/irq/chip.c	2007-08-12 17:18:04.000000000 +0200
>@@ -352,13 +352,10 @@ handle_level_irq(unsigned int irq, struc
> 	 * keep it masked and get out of here
> 	 */
> 	action = desc->action;
>-	if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
>-		desc->status |= IRQ_PENDING;
>+	if (unlikely(!action || (desc->status & IRQ_DISABLED)))
> 		goto out_unlock;
>-	}
> 
> 	desc->status |= IRQ_INPROGRESS;
>-	desc->status &= ~IRQ_PENDING;
> 	spin_unlock(&desc->lock);
> 
> 	action_ret = handle_IRQ_event(irq, action);

Actions: View | Diff

Attachments on bug 245247: 157571 | 192481 | 192491 | 192501 | 192701