diff for duplicates of <20070320150027.GA18143@strauss.suse.de> diff --git a/a/1.txt b/N1/1.txt index 347d0aa..f90bd8c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,8 @@ Acked-by: Thomas Gleixner <tglx@linutronix.de> 6 files changed, 24 insertions(+), 4 deletions(-) Index: mainline-msi-init/arch/ia64/kernel/irq_ia64.c -=================================--- mainline-msi-init.orig/arch/ia64/kernel/irq_ia64.c +=================================================================== +--- mainline-msi-init.orig/arch/ia64/kernel/irq_ia64.c +++ mainline-msi-init/arch/ia64/kernel/irq_ia64.c @@ -280,11 +280,12 @@ static struct irqaction resched_irqactio }; @@ -40,7 +41,7 @@ Index: mainline-msi-init/arch/ia64/kernel/irq_ia64.c + int first_match = -1; for (irq = 0; irq < NR_IRQS; ++irq) - if (irq_to_vector(irq) = vec) { + if (irq_to_vector(irq) == vec) { @@ -293,7 +294,10 @@ register_percpu_irq (ia64_vector vec, st desc->chip = &irq_type_ia64_lsapic; if (action) @@ -53,7 +54,8 @@ Index: mainline-msi-init/arch/ia64/kernel/irq_ia64.c void __init 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 @@ -247,7 +247,11 @@ void __devinit ia64_disable_timer(void) void __init @@ -69,7 +71,8 @@ Index: mainline-msi-init/arch/ia64/kernel/time.c ia64_init_itm(); Index: mainline-msi-init/include/linux/irq.h -=================================--- mainline-msi-init.orig/include/linux/irq.h +=================================================================== +--- mainline-msi-init.orig/include/linux/irq.h +++ mainline-msi-init/include/linux/irq.h @@ -272,6 +272,9 @@ static inline int irq_balancing_disabled /* Handle irq action chains: */ @@ -82,7 +85,8 @@ Index: mainline-msi-init/include/linux/irq.h * Built-in IRQ handlers for various IRQ types, * callable via desc->chip->handle_irq() 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 @@ -12,6 +12,7 @@ #include <linux/interrupt.h> @@ -96,10 +100,10 @@ Index: mainline-msi-init/kernel/irq/spurious.c if (unlikely(irqfixup)) { /* Don't punish working computers */ -- if ((irqfixup = 2 && irq = 0) || action_ret = IRQ_NONE) { -+ if ((irqfixup = 2 && irq = timer_irq) || action_ret = IRQ_NONE) { +- if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) { ++ if ((irqfixup == 2 && irq == timer_irq) || action_ret == IRQ_NONE) { int ok = misrouted_irq(irq); - if (action_ret = IRQ_NONE) + if (action_ret == IRQ_NONE) desc->irqs_unhandled -= ok; @@ -174,6 +175,12 @@ void note_interrupt(unsigned int irq, st desc->irqs_unhandled = 0; @@ -115,7 +119,8 @@ Index: mainline-msi-init/kernel/irq/spurious.c int noirqdebug_setup(char *str) Index: mainline-msi-init/include/asm-ia64/hw_irq.h -=================================--- mainline-msi-init.orig/include/asm-ia64/hw_irq.h +=================================================================== +--- mainline-msi-init.orig/include/asm-ia64/hw_irq.h +++ mainline-msi-init/include/asm-ia64/hw_irq.h @@ -95,7 +95,7 @@ extern int assign_irq_vector (int irq); extern void free_irq_vector (int vector); @@ -127,7 +132,8 @@ Index: mainline-msi-init/include/asm-ia64/hw_irq.h static inline void ia64_resend_irq(unsigned int vector) { Index: mainline-msi-init/kernel/irq/handle.c -=================================--- mainline-msi-init.orig/kernel/irq/handle.c +=================================================================== +--- mainline-msi-init.orig/kernel/irq/handle.c +++ mainline-msi-init/kernel/irq/handle.c @@ -180,6 +180,8 @@ fastcall unsigned int __do_IRQ(unsigned if (desc->chip->ack) diff --git a/a/content_digest b/N1/content_digest index 2d965dc..1556ab4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Bernhard Walle <bwalle@suse.de>\0" "Subject\0[PATCH] Fix irqpoll on IA64 (timer interrupt != 0)\0" - "Date\0Tue, 20 Mar 2007 14:59:35 +0000\0" + "Date\0Tue, 20 Mar 2007 16:00:27 +0100\0" "To\0linux-ia64@vger.kernel.org" " linux-kernel@vger.kernel.org\0" "Cc\0Thomas Gleixner <tglx@linutronix.de>" @@ -34,7 +34,8 @@ " 6 files changed, 24 insertions(+), 4 deletions(-)\n" "\n" "Index: mainline-msi-init/arch/ia64/kernel/irq_ia64.c\n" - "=================================--- mainline-msi-init.orig/arch/ia64/kernel/irq_ia64.c\n" + "===================================================================\n" + "--- mainline-msi-init.orig/arch/ia64/kernel/irq_ia64.c\n" "+++ mainline-msi-init/arch/ia64/kernel/irq_ia64.c\n" "@@ -280,11 +280,12 @@ static struct irqaction resched_irqactio\n" " };\n" @@ -49,7 +50,7 @@ "+\tint first_match = -1;\n" " \n" " \tfor (irq = 0; irq < NR_IRQS; ++irq)\n" - " \t\tif (irq_to_vector(irq) = vec) {\n" + " \t\tif (irq_to_vector(irq) == vec) {\n" "@@ -293,7 +294,10 @@ register_percpu_irq (ia64_vector vec, st\n" " \t\t\tdesc->chip = &irq_type_ia64_lsapic;\n" " \t\t\tif (action)\n" @@ -62,7 +63,8 @@ " \n" " void __init\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" "@@ -247,7 +247,11 @@ void __devinit ia64_disable_timer(void)\n" " void __init\n" @@ -78,7 +80,8 @@ " \tia64_init_itm();\n" " \n" "Index: mainline-msi-init/include/linux/irq.h\n" - "=================================--- mainline-msi-init.orig/include/linux/irq.h\n" + "===================================================================\n" + "--- mainline-msi-init.orig/include/linux/irq.h\n" "+++ mainline-msi-init/include/linux/irq.h\n" "@@ -272,6 +272,9 @@ static inline int irq_balancing_disabled\n" " /* Handle irq action chains: */\n" @@ -91,7 +94,8 @@ " * Built-in IRQ handlers for various IRQ types,\n" " * callable via desc->chip->handle_irq()\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" "@@ -12,6 +12,7 @@\n" " #include <linux/interrupt.h>\n" @@ -105,10 +109,10 @@ " \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 && irq = timer_irq) || action_ret = IRQ_NONE) {\n" + "-\t\tif ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) {\n" + "+\t\tif ((irqfixup == 2 && irq == timer_irq) || 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" "@@ -174,6 +175,12 @@ void note_interrupt(unsigned int irq, st\n" " \tdesc->irqs_unhandled = 0;\n" @@ -124,7 +128,8 @@ " \n" " int noirqdebug_setup(char *str)\n" "Index: mainline-msi-init/include/asm-ia64/hw_irq.h\n" - "=================================--- mainline-msi-init.orig/include/asm-ia64/hw_irq.h\n" + "===================================================================\n" + "--- mainline-msi-init.orig/include/asm-ia64/hw_irq.h\n" "+++ mainline-msi-init/include/asm-ia64/hw_irq.h\n" "@@ -95,7 +95,7 @@ extern int assign_irq_vector (int irq);\t\n" " extern void free_irq_vector (int vector);\n" @@ -136,7 +141,8 @@ " static inline void ia64_resend_irq(unsigned int vector)\n" " {\n" "Index: mainline-msi-init/kernel/irq/handle.c\n" - "=================================--- mainline-msi-init.orig/kernel/irq/handle.c\n" + "===================================================================\n" + "--- mainline-msi-init.orig/kernel/irq/handle.c\n" "+++ mainline-msi-init/kernel/irq/handle.c\n" "@@ -180,6 +180,8 @@ fastcall unsigned int __do_IRQ(unsigned \n" " \t\tif (desc->chip->ack)\n" @@ -148,4 +154,4 @@ " \t\treturn 1;\n" " \t}" -98025e1da9b6c9ba1e863b558d274e840a91c9a37d96dbd7a1be7ac1eba9764e +ee1b4f6049dc1f3a36e37a5a2286016a8dd03dbe83e9698ecf1dc60f3df30722
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.