diff for duplicates of <20070322161545.c8ad3b7a.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index a0693af..948642d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,8 @@ Bernhard Walle <bwalle@suse.de> wrote: > > > Index: mainline-msi-init/arch/ia64/kernel/time.c -> =================================> --- mainline-msi-init.orig/arch/ia64/kernel/time.c +> =================================================================== +> --- mainline-msi-init.orig/arch/ia64/kernel/time.c > +++ mainline-msi-init/arch/ia64/kernel/time.c > @@ -235,7 +235,7 @@ ia64_init_itm (void) > @@ -58,7 +59,8 @@ Bernhard Walle <bwalle@suse.de> wrote: > }; > > Index: mainline-msi-init/arch/x86_64/kernel/time.c -> =================================> --- mainline-msi-init.orig/arch/x86_64/kernel/time.c +> =================================================================== +> --- mainline-msi-init.orig/arch/x86_64/kernel/time.c > +++ mainline-msi-init/arch/x86_64/kernel/time.c > @@ -320,7 +320,7 @@ void __init stop_timer_interrupt(void) > } @@ -70,16 +72,17 @@ Bernhard Walle <bwalle@suse.de> wrote: > > void __init time_init(void) > Index: mainline-msi-init/kernel/irq/spurious.c -> =================================> --- mainline-msi-init.orig/kernel/irq/spurious.c +> =================================================================== +> --- mainline-msi-init.orig/kernel/irq/spurious.c > +++ mainline-msi-init/kernel/irq/spurious.c > @@ -146,7 +146,7 @@ void note_interrupt(unsigned int irq, st > > if (unlikely(irqfixup)) { > /* Don't punish working computers */ -> - if ((irqfixup = 2 && irq = 0) || action_ret = IRQ_NONE) { -> + if ((irqfixup = 2 && (desc->action->flags & IRQF_TIMER)) || action_ret = IRQ_NONE) { +> - if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) { +> + if ((irqfixup == 2 && (desc->action->flags & IRQF_TIMER)) || action_ret == IRQ_NONE) { > int ok = misrouted_irq(irq); -> if (action_ret = IRQ_NONE) +> if (action_ret == IRQ_NONE) > desc->irqs_unhandled -= ok; Seems sane. diff --git a/a/content_digest b/N1/content_digest index 3352bdb..9449f70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020070322230407.GA3333@sykes.suse.de\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" "Subject\0Re: [PATCH] Fix irqpoll on IA64 (timer interrupt != 0)\0" - "Date\0Thu, 22 Mar 2007 23:15:45 +0000\0" + "Date\0Thu, 22 Mar 2007 16:15:45 -0700\0" "To\0Bernhard Walle <bwalle@suse.de>\0" "Cc\0linux-ia64@vger.kernel.org" linux-kernel@vger.kernel.org @@ -59,7 +59,8 @@ "> \n" "> \n" "> Index: mainline-msi-init/arch/ia64/kernel/time.c\n" - "> =================================> --- mainline-msi-init.orig/arch/ia64/kernel/time.c\n" + "> ===================================================================\n" + "> --- mainline-msi-init.orig/arch/ia64/kernel/time.c\n" "> +++ mainline-msi-init/arch/ia64/kernel/time.c\n" "> @@ -235,7 +235,7 @@ ia64_init_itm (void)\n" "> \n" @@ -71,7 +72,8 @@ "> };\n" "> \n" "> Index: mainline-msi-init/arch/x86_64/kernel/time.c\n" - "> =================================> --- mainline-msi-init.orig/arch/x86_64/kernel/time.c\n" + "> ===================================================================\n" + "> --- mainline-msi-init.orig/arch/x86_64/kernel/time.c\n" "> +++ mainline-msi-init/arch/x86_64/kernel/time.c\n" "> @@ -320,7 +320,7 @@ void __init stop_timer_interrupt(void)\n" "> }\n" @@ -83,20 +85,21 @@ "> \n" "> void __init time_init(void)\n" "> Index: mainline-msi-init/kernel/irq/spurious.c\n" - "> =================================> --- mainline-msi-init.orig/kernel/irq/spurious.c\n" + "> ===================================================================\n" + "> --- mainline-msi-init.orig/kernel/irq/spurious.c\n" "> +++ mainline-msi-init/kernel/irq/spurious.c\n" "> @@ -146,7 +146,7 @@ void note_interrupt(unsigned int irq, st\n" "> \n" "> \tif (unlikely(irqfixup)) {\n" "> \t\t/* Don't punish working computers */\n" - "> -\t\tif ((irqfixup = 2 && irq = 0) || action_ret = IRQ_NONE) {\n" - "> +\t\tif ((irqfixup = 2 && (desc->action->flags & IRQF_TIMER)) || action_ret = IRQ_NONE) {\n" + "> -\t\tif ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) {\n" + "> +\t\tif ((irqfixup == 2 && (desc->action->flags & IRQF_TIMER)) || action_ret == IRQ_NONE) {\n" "> \t\t\tint ok = misrouted_irq(irq);\n" - "> \t\t\tif (action_ret = IRQ_NONE)\n" + "> \t\t\tif (action_ret == IRQ_NONE)\n" "> \t\t\t\tdesc->irqs_unhandled -= ok;\n" "\n" "Seems sane.\n" "\n" Or we could add a new flag specifically for this purpose: IRQF_IRQPOLL_IRQ? -48781bccb303ffb085226f29f6bc5a0357961404671756b9dc0b7ff6d1e3c32f +3923cffa26f90c86871beda1ca0b1db9f4aa536d74e614529a5de3b36d32af8a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.