diff for duplicates of <4BA3CA3E.7010207@kernel.org> diff --git a/a/1.txt b/N1/1.txt index f439c41..ee7e34b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -63,7 +63,8 @@ Cc: linux-sh@vger.kernel.org 11 files changed, 101 insertions(+), 25 deletions(-) Index: linux-2.6/arch/powerpc/kernel/irq.c -=================================--- linux-2.6.orig/arch/powerpc/kernel/irq.c +=================================================================== +--- linux-2.6.orig/arch/powerpc/kernel/irq.c +++ linux-2.6/arch/powerpc/kernel/irq.c @@ -1088,7 +1088,7 @@ int arch_early_irq_init(void) return 0; @@ -75,7 +76,8 @@ Index: linux-2.6/arch/powerpc/kernel/irq.c desc->status |= IRQ_NOREQUEST; return 0; Index: linux-2.6/arch/x86/include/asm/hw_irq.h -=================================--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h +=================================================================== +--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h +++ linux-2.6/arch/x86/include/asm/hw_irq.h @@ -20,9 +20,9 @@ #include <linux/percpu.h> @@ -101,7 +103,8 @@ Index: linux-2.6/arch/x86/include/asm/hw_irq.h int ioapic; int ioapic_pin; Index: linux-2.6/arch/x86/kernel/apic/io_apic.c -=================================--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +++ linux-2.6/arch/x86/kernel/apic/io_apic.c @@ -211,7 +211,7 @@ static struct irq_cfg *get_one_free_irq_ return cfg; @@ -244,7 +247,8 @@ Index: linux-2.6/arch/x86/kernel/apic/io_apic.c int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) Index: linux-2.6/arch/x86/kernel/uv_irq.c -=================================--- linux-2.6.orig/arch/x86/kernel/uv_irq.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/uv_irq.c +++ linux-2.6/arch/x86/kernel/uv_irq.c @@ -55,6 +55,9 @@ struct irq_chip uv_irq_chip = { .eoi = uv_ack_apic, @@ -257,7 +261,8 @@ Index: linux-2.6/arch/x86/kernel/uv_irq.c /* Index: linux-2.6/drivers/xen/events.c -=================================--- linux-2.6.orig/drivers/xen/events.c +=================================================================== +--- linux-2.6.orig/drivers/xen/events.c +++ linux-2.6/drivers/xen/events.c @@ -329,6 +329,11 @@ static void unmask_evtchn(int port) put_cpu(); @@ -272,16 +277,17 @@ Index: linux-2.6/drivers/xen/events.c { int irq; @@ -341,7 +346,7 @@ static int find_unbound_irq(void) - if (irq = nr_irqs) + if (irq == nr_irqs) panic("No available IRQ to bind to: increase nr_irqs!\n"); - desc = irq_to_desc_alloc_node(irq, 0); + desc = irq_to_desc_alloc_node_x(irq, 0, xen_init_chip_data); - if (WARN_ON(desc = NULL)) + if (WARN_ON(desc == NULL)) return -1; Index: linux-2.6/include/linux/interrupt.h -=================================--- linux-2.6.orig/include/linux/interrupt.h +=================================================================== +--- linux-2.6.orig/include/linux/interrupt.h +++ linux-2.6/include/linux/interrupt.h @@ -611,6 +611,5 @@ struct irq_desc; extern int early_irq_init(void); @@ -291,7 +297,8 @@ Index: linux-2.6/include/linux/interrupt.h #endif Index: linux-2.6/include/linux/irq.h -=================================--- linux-2.6.orig/include/linux/irq.h +=================================================================== +--- linux-2.6.orig/include/linux/irq.h +++ linux-2.6/include/linux/irq.h @@ -131,6 +131,12 @@ struct irq_chip { void (*bus_lock)(unsigned int irq); @@ -335,7 +342,8 @@ Index: linux-2.6/include/linux/irq.h /* * Pick up the arch-dependent methods: Index: linux-2.6/kernel/irq/handle.c -=================================--- linux-2.6.orig/kernel/irq/handle.c +=================================================================== +--- linux-2.6.orig/kernel/irq/handle.c +++ linux-2.6/kernel/irq/handle.c @@ -100,7 +100,8 @@ void __ref init_kstat_irqs(struct irq_de } @@ -386,7 +394,8 @@ Index: linux-2.6/kernel/irq/handle.c return irq_to_desc(irq); } Index: linux-2.6/kernel/irq/numa_migrate.c -=================================--- linux-2.6.orig/kernel/irq/numa_migrate.c +=================================================================== +--- linux-2.6.orig/kernel/irq/numa_migrate.c +++ linux-2.6/kernel/irq/numa_migrate.c @@ -47,7 +47,8 @@ static bool init_copy_one_irq_desc(int i lockdep_set_class(&desc->lock, &irq_desc_lock_class); @@ -414,18 +423,19 @@ Index: linux-2.6/kernel/irq/numa_migrate.c { + /* those static or target node is -1, do not move them */ - if (desc->irq < NR_IRQS_LEGACY || node = -1) + if (desc->irq < NR_IRQS_LEGACY || node == -1) return desc; + /* IRQ chip does not support movement */ + if (desc->chip_data && -+ (desc->chip->copy_chip_data = NULL || -+ desc->chip->free_chip_data = NULL)) ++ (desc->chip->copy_chip_data == NULL || ++ desc->chip->free_chip_data == NULL)) + return desc; if (desc->node != node) desc = __real_move_irq_desc(desc, node); Index: linux-2.6/kernel/softirq.c -=================================--- linux-2.6.orig/kernel/softirq.c +=================================================================== +--- linux-2.6.orig/kernel/softirq.c +++ linux-2.6/kernel/softirq.c @@ -895,8 +895,3 @@ int __init __weak arch_early_irq_init(vo { @@ -437,7 +447,8 @@ Index: linux-2.6/kernel/softirq.c - return 0; -} Index: linux-2.6/kernel/irq/chip.c -=================================--- linux-2.6.orig/kernel/irq/chip.c +=================================================================== +--- linux-2.6.orig/kernel/irq/chip.c +++ linux-2.6/kernel/irq/chip.c @@ -758,3 +758,10 @@ void __init set_irq_probe(unsigned int i desc->status &= ~IRQ_NOPROBE; diff --git a/a/content_digest b/N1/content_digest index 2c7b21f..546a5cb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01268998032.10129.44653.camel@zakaz.uk.xensource.com\0" "ref\01268998041-22707-1-git-send-email-ian.campbell@citrix.com\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" - "Subject\0Re: [PATCH 1/2] irq: move some interrupt arch_* functions into struct\0" - "Date\0Fri, 19 Mar 2010 19:02:22 +0000\0" + "Subject\0Re: [PATCH 1/2] irq: move some interrupt arch_* functions into struct irq_chip.\0" + "Date\0Fri, 19 Mar 2010 12:02:22 -0700\0" "To\0Ian Campbell <ian.campbell@citrix.com>\0" "Cc\0lguest@ozlabs.org" Jeremy Fitzhardinge <jeremy@goop.org> @@ -84,7 +84,8 @@ " 11 files changed, 101 insertions(+), 25 deletions(-)\n" "\n" "Index: linux-2.6/arch/powerpc/kernel/irq.c\n" - "=================================--- linux-2.6.orig/arch/powerpc/kernel/irq.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/powerpc/kernel/irq.c\n" "+++ linux-2.6/arch/powerpc/kernel/irq.c\n" "@@ -1088,7 +1088,7 @@ int arch_early_irq_init(void)\n" " \treturn 0;\n" @@ -96,7 +97,8 @@ " \tdesc->status |= IRQ_NOREQUEST;\n" " \treturn 0;\n" "Index: linux-2.6/arch/x86/include/asm/hw_irq.h\n" - "=================================--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h\n" "+++ linux-2.6/arch/x86/include/asm/hw_irq.h\n" "@@ -20,9 +20,9 @@\n" " #include <linux/percpu.h>\n" @@ -122,7 +124,8 @@ " \tint ioapic;\n" " \tint ioapic_pin;\n" "Index: linux-2.6/arch/x86/kernel/apic/io_apic.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c\n" "+++ linux-2.6/arch/x86/kernel/apic/io_apic.c\n" "@@ -211,7 +211,7 @@ static struct irq_cfg *get_one_free_irq_\n" " \treturn cfg;\n" @@ -265,7 +268,8 @@ " \n" " int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)\n" "Index: linux-2.6/arch/x86/kernel/uv_irq.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/uv_irq.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/uv_irq.c\n" "+++ linux-2.6/arch/x86/kernel/uv_irq.c\n" "@@ -55,6 +55,9 @@ struct irq_chip uv_irq_chip = {\n" " \t.eoi\t\t= uv_ack_apic,\n" @@ -278,7 +282,8 @@ " \n" " /*\n" "Index: linux-2.6/drivers/xen/events.c\n" - "=================================--- linux-2.6.orig/drivers/xen/events.c\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/xen/events.c\n" "+++ linux-2.6/drivers/xen/events.c\n" "@@ -329,6 +329,11 @@ static void unmask_evtchn(int port)\n" " \tput_cpu();\n" @@ -293,16 +298,17 @@ " {\n" " \tint irq;\n" "@@ -341,7 +346,7 @@ static int find_unbound_irq(void)\n" - " \tif (irq = nr_irqs)\n" + " \tif (irq == nr_irqs)\n" " \t\tpanic(\"No available IRQ to bind to: increase nr_irqs!\\n\");\n" " \n" "-\tdesc = irq_to_desc_alloc_node(irq, 0);\n" "+\tdesc = irq_to_desc_alloc_node_x(irq, 0, xen_init_chip_data);\n" - " \tif (WARN_ON(desc = NULL))\n" + " \tif (WARN_ON(desc == NULL))\n" " \t\treturn -1;\n" " \n" "Index: linux-2.6/include/linux/interrupt.h\n" - "=================================--- linux-2.6.orig/include/linux/interrupt.h\n" + "===================================================================\n" + "--- linux-2.6.orig/include/linux/interrupt.h\n" "+++ linux-2.6/include/linux/interrupt.h\n" "@@ -611,6 +611,5 @@ struct irq_desc;\n" " extern int early_irq_init(void);\n" @@ -312,7 +318,8 @@ " \n" " #endif\n" "Index: linux-2.6/include/linux/irq.h\n" - "=================================--- linux-2.6.orig/include/linux/irq.h\n" + "===================================================================\n" + "--- linux-2.6.orig/include/linux/irq.h\n" "+++ linux-2.6/include/linux/irq.h\n" "@@ -131,6 +131,12 @@ struct irq_chip {\n" " \tvoid\t\t(*bus_lock)(unsigned int irq);\n" @@ -356,7 +363,8 @@ " /*\n" " * Pick up the arch-dependent methods:\n" "Index: linux-2.6/kernel/irq/handle.c\n" - "=================================--- linux-2.6.orig/kernel/irq/handle.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/irq/handle.c\n" "+++ linux-2.6/kernel/irq/handle.c\n" "@@ -100,7 +100,8 @@ void __ref init_kstat_irqs(struct irq_de\n" " \t}\n" @@ -407,7 +415,8 @@ " \treturn irq_to_desc(irq);\n" " }\n" "Index: linux-2.6/kernel/irq/numa_migrate.c\n" - "=================================--- linux-2.6.orig/kernel/irq/numa_migrate.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/irq/numa_migrate.c\n" "+++ linux-2.6/kernel/irq/numa_migrate.c\n" "@@ -47,7 +47,8 @@ static bool init_copy_one_irq_desc(int i\n" " \tlockdep_set_class(&desc->lock, &irq_desc_lock_class);\n" @@ -435,18 +444,19 @@ " {\n" "+\n" " \t/* those static or target node is -1, do not move them */\n" - " \tif (desc->irq < NR_IRQS_LEGACY || node = -1)\n" + " \tif (desc->irq < NR_IRQS_LEGACY || node == -1)\n" " \t\treturn desc;\n" "+\t/* IRQ chip does not support movement */\n" "+\tif (desc->chip_data &&\n" - "+\t (desc->chip->copy_chip_data = NULL ||\n" - "+\t desc->chip->free_chip_data = NULL))\n" + "+\t (desc->chip->copy_chip_data == NULL ||\n" + "+\t desc->chip->free_chip_data == NULL))\n" "+\t\treturn desc;\n" " \n" " \tif (desc->node != node)\n" " \t\tdesc = __real_move_irq_desc(desc, node);\n" "Index: linux-2.6/kernel/softirq.c\n" - "=================================--- linux-2.6.orig/kernel/softirq.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/softirq.c\n" "+++ linux-2.6/kernel/softirq.c\n" "@@ -895,8 +895,3 @@ int __init __weak arch_early_irq_init(vo\n" " {\n" @@ -458,7 +468,8 @@ "-\treturn 0;\n" "-}\n" "Index: linux-2.6/kernel/irq/chip.c\n" - "=================================--- linux-2.6.orig/kernel/irq/chip.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/irq/chip.c\n" "+++ linux-2.6/kernel/irq/chip.c\n" "@@ -758,3 +758,10 @@ void __init set_irq_probe(unsigned int i\n" " \tdesc->status &= ~IRQ_NOPROBE;\n" @@ -472,4 +483,4 @@ "+}\n" + -97aacfead37dbf0ffe38f36683e8411dcda706a6fd2b042e084aa4c67d28cc42 +c7c4e7c272b1dbc22460a808a6326a1ee4525667460e665ae8e9331ab5a0e903
diff --git a/a/1.txt b/N2/1.txt index f439c41..ee7e34b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -63,7 +63,8 @@ Cc: linux-sh@vger.kernel.org 11 files changed, 101 insertions(+), 25 deletions(-) Index: linux-2.6/arch/powerpc/kernel/irq.c -=================================--- linux-2.6.orig/arch/powerpc/kernel/irq.c +=================================================================== +--- linux-2.6.orig/arch/powerpc/kernel/irq.c +++ linux-2.6/arch/powerpc/kernel/irq.c @@ -1088,7 +1088,7 @@ int arch_early_irq_init(void) return 0; @@ -75,7 +76,8 @@ Index: linux-2.6/arch/powerpc/kernel/irq.c desc->status |= IRQ_NOREQUEST; return 0; Index: linux-2.6/arch/x86/include/asm/hw_irq.h -=================================--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h +=================================================================== +--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h +++ linux-2.6/arch/x86/include/asm/hw_irq.h @@ -20,9 +20,9 @@ #include <linux/percpu.h> @@ -101,7 +103,8 @@ Index: linux-2.6/arch/x86/include/asm/hw_irq.h int ioapic; int ioapic_pin; Index: linux-2.6/arch/x86/kernel/apic/io_apic.c -=================================--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +++ linux-2.6/arch/x86/kernel/apic/io_apic.c @@ -211,7 +211,7 @@ static struct irq_cfg *get_one_free_irq_ return cfg; @@ -244,7 +247,8 @@ Index: linux-2.6/arch/x86/kernel/apic/io_apic.c int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) Index: linux-2.6/arch/x86/kernel/uv_irq.c -=================================--- linux-2.6.orig/arch/x86/kernel/uv_irq.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/uv_irq.c +++ linux-2.6/arch/x86/kernel/uv_irq.c @@ -55,6 +55,9 @@ struct irq_chip uv_irq_chip = { .eoi = uv_ack_apic, @@ -257,7 +261,8 @@ Index: linux-2.6/arch/x86/kernel/uv_irq.c /* Index: linux-2.6/drivers/xen/events.c -=================================--- linux-2.6.orig/drivers/xen/events.c +=================================================================== +--- linux-2.6.orig/drivers/xen/events.c +++ linux-2.6/drivers/xen/events.c @@ -329,6 +329,11 @@ static void unmask_evtchn(int port) put_cpu(); @@ -272,16 +277,17 @@ Index: linux-2.6/drivers/xen/events.c { int irq; @@ -341,7 +346,7 @@ static int find_unbound_irq(void) - if (irq = nr_irqs) + if (irq == nr_irqs) panic("No available IRQ to bind to: increase nr_irqs!\n"); - desc = irq_to_desc_alloc_node(irq, 0); + desc = irq_to_desc_alloc_node_x(irq, 0, xen_init_chip_data); - if (WARN_ON(desc = NULL)) + if (WARN_ON(desc == NULL)) return -1; Index: linux-2.6/include/linux/interrupt.h -=================================--- linux-2.6.orig/include/linux/interrupt.h +=================================================================== +--- linux-2.6.orig/include/linux/interrupt.h +++ linux-2.6/include/linux/interrupt.h @@ -611,6 +611,5 @@ struct irq_desc; extern int early_irq_init(void); @@ -291,7 +297,8 @@ Index: linux-2.6/include/linux/interrupt.h #endif Index: linux-2.6/include/linux/irq.h -=================================--- linux-2.6.orig/include/linux/irq.h +=================================================================== +--- linux-2.6.orig/include/linux/irq.h +++ linux-2.6/include/linux/irq.h @@ -131,6 +131,12 @@ struct irq_chip { void (*bus_lock)(unsigned int irq); @@ -335,7 +342,8 @@ Index: linux-2.6/include/linux/irq.h /* * Pick up the arch-dependent methods: Index: linux-2.6/kernel/irq/handle.c -=================================--- linux-2.6.orig/kernel/irq/handle.c +=================================================================== +--- linux-2.6.orig/kernel/irq/handle.c +++ linux-2.6/kernel/irq/handle.c @@ -100,7 +100,8 @@ void __ref init_kstat_irqs(struct irq_de } @@ -386,7 +394,8 @@ Index: linux-2.6/kernel/irq/handle.c return irq_to_desc(irq); } Index: linux-2.6/kernel/irq/numa_migrate.c -=================================--- linux-2.6.orig/kernel/irq/numa_migrate.c +=================================================================== +--- linux-2.6.orig/kernel/irq/numa_migrate.c +++ linux-2.6/kernel/irq/numa_migrate.c @@ -47,7 +47,8 @@ static bool init_copy_one_irq_desc(int i lockdep_set_class(&desc->lock, &irq_desc_lock_class); @@ -414,18 +423,19 @@ Index: linux-2.6/kernel/irq/numa_migrate.c { + /* those static or target node is -1, do not move them */ - if (desc->irq < NR_IRQS_LEGACY || node = -1) + if (desc->irq < NR_IRQS_LEGACY || node == -1) return desc; + /* IRQ chip does not support movement */ + if (desc->chip_data && -+ (desc->chip->copy_chip_data = NULL || -+ desc->chip->free_chip_data = NULL)) ++ (desc->chip->copy_chip_data == NULL || ++ desc->chip->free_chip_data == NULL)) + return desc; if (desc->node != node) desc = __real_move_irq_desc(desc, node); Index: linux-2.6/kernel/softirq.c -=================================--- linux-2.6.orig/kernel/softirq.c +=================================================================== +--- linux-2.6.orig/kernel/softirq.c +++ linux-2.6/kernel/softirq.c @@ -895,8 +895,3 @@ int __init __weak arch_early_irq_init(vo { @@ -437,7 +447,8 @@ Index: linux-2.6/kernel/softirq.c - return 0; -} Index: linux-2.6/kernel/irq/chip.c -=================================--- linux-2.6.orig/kernel/irq/chip.c +=================================================================== +--- linux-2.6.orig/kernel/irq/chip.c +++ linux-2.6/kernel/irq/chip.c @@ -758,3 +758,10 @@ void __init set_irq_probe(unsigned int i desc->status &= ~IRQ_NOPROBE; diff --git a/a/content_digest b/N2/content_digest index 2c7b21f..47de144 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,23 @@ "ref\01268998032.10129.44653.camel@zakaz.uk.xensource.com\0" "ref\01268998041-22707-1-git-send-email-ian.campbell@citrix.com\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" - "Subject\0Re: [PATCH 1/2] irq: move some interrupt arch_* functions into struct\0" - "Date\0Fri, 19 Mar 2010 19:02:22 +0000\0" + "Subject\0Re: [PATCH 1/2] irq: move some interrupt arch_* functions into struct irq_chip.\0" + "Date\0Fri, 19 Mar 2010 12:02:22 -0700\0" "To\0Ian Campbell <ian.campbell@citrix.com>\0" - "Cc\0lguest@ozlabs.org" + "Cc\0linux-kernel@vger.kernel.org" + Thomas Gleixner <tglx@linutronix.de> + Ingo Molnar <mingo@redhat.com> + H. Peter Anvin <hpa@zytor.com> + Eric W. Biederman <ebiederm@xmission.com> Jeremy Fitzhardinge <jeremy@goop.org> - Rusty Russell <rusty@rustcorp.com.au> - Paul Mundt <lethal@linux-sh.org> - linux-sh@vger.kernel.org + Benjamin Herrenschmidt <benh@kernel.crashing.org> + Paul Mackerras <paulus@samba.org> x86@kernel.org - linux-kernel@vger.kernel.org linuxppc-dev@ozlabs.org - Ingo Molnar <mingo@redhat.com> - Paul Mackerras <paulus@samba.org> - Eric W. Biederman <ebiederm@xmission.com> - H. Peter Anvin <hpa@zytor.com> - " Thomas Gleixner <tglx@linutronix.de>\0" + Rusty Russell <rusty@rustcorp.com.au> + lguest@ozlabs.org + Paul Mundt <lethal@linux-sh.org> + " linux-sh@vger.kernel.org\0" "\00:1\0" "b\0" "please check\n" @@ -84,7 +85,8 @@ " 11 files changed, 101 insertions(+), 25 deletions(-)\n" "\n" "Index: linux-2.6/arch/powerpc/kernel/irq.c\n" - "=================================--- linux-2.6.orig/arch/powerpc/kernel/irq.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/powerpc/kernel/irq.c\n" "+++ linux-2.6/arch/powerpc/kernel/irq.c\n" "@@ -1088,7 +1088,7 @@ int arch_early_irq_init(void)\n" " \treturn 0;\n" @@ -96,7 +98,8 @@ " \tdesc->status |= IRQ_NOREQUEST;\n" " \treturn 0;\n" "Index: linux-2.6/arch/x86/include/asm/hw_irq.h\n" - "=================================--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/include/asm/hw_irq.h\n" "+++ linux-2.6/arch/x86/include/asm/hw_irq.h\n" "@@ -20,9 +20,9 @@\n" " #include <linux/percpu.h>\n" @@ -122,7 +125,8 @@ " \tint ioapic;\n" " \tint ioapic_pin;\n" "Index: linux-2.6/arch/x86/kernel/apic/io_apic.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c\n" "+++ linux-2.6/arch/x86/kernel/apic/io_apic.c\n" "@@ -211,7 +211,7 @@ static struct irq_cfg *get_one_free_irq_\n" " \treturn cfg;\n" @@ -265,7 +269,8 @@ " \n" " int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)\n" "Index: linux-2.6/arch/x86/kernel/uv_irq.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/uv_irq.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/uv_irq.c\n" "+++ linux-2.6/arch/x86/kernel/uv_irq.c\n" "@@ -55,6 +55,9 @@ struct irq_chip uv_irq_chip = {\n" " \t.eoi\t\t= uv_ack_apic,\n" @@ -278,7 +283,8 @@ " \n" " /*\n" "Index: linux-2.6/drivers/xen/events.c\n" - "=================================--- linux-2.6.orig/drivers/xen/events.c\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/xen/events.c\n" "+++ linux-2.6/drivers/xen/events.c\n" "@@ -329,6 +329,11 @@ static void unmask_evtchn(int port)\n" " \tput_cpu();\n" @@ -293,16 +299,17 @@ " {\n" " \tint irq;\n" "@@ -341,7 +346,7 @@ static int find_unbound_irq(void)\n" - " \tif (irq = nr_irqs)\n" + " \tif (irq == nr_irqs)\n" " \t\tpanic(\"No available IRQ to bind to: increase nr_irqs!\\n\");\n" " \n" "-\tdesc = irq_to_desc_alloc_node(irq, 0);\n" "+\tdesc = irq_to_desc_alloc_node_x(irq, 0, xen_init_chip_data);\n" - " \tif (WARN_ON(desc = NULL))\n" + " \tif (WARN_ON(desc == NULL))\n" " \t\treturn -1;\n" " \n" "Index: linux-2.6/include/linux/interrupt.h\n" - "=================================--- linux-2.6.orig/include/linux/interrupt.h\n" + "===================================================================\n" + "--- linux-2.6.orig/include/linux/interrupt.h\n" "+++ linux-2.6/include/linux/interrupt.h\n" "@@ -611,6 +611,5 @@ struct irq_desc;\n" " extern int early_irq_init(void);\n" @@ -312,7 +319,8 @@ " \n" " #endif\n" "Index: linux-2.6/include/linux/irq.h\n" - "=================================--- linux-2.6.orig/include/linux/irq.h\n" + "===================================================================\n" + "--- linux-2.6.orig/include/linux/irq.h\n" "+++ linux-2.6/include/linux/irq.h\n" "@@ -131,6 +131,12 @@ struct irq_chip {\n" " \tvoid\t\t(*bus_lock)(unsigned int irq);\n" @@ -356,7 +364,8 @@ " /*\n" " * Pick up the arch-dependent methods:\n" "Index: linux-2.6/kernel/irq/handle.c\n" - "=================================--- linux-2.6.orig/kernel/irq/handle.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/irq/handle.c\n" "+++ linux-2.6/kernel/irq/handle.c\n" "@@ -100,7 +100,8 @@ void __ref init_kstat_irqs(struct irq_de\n" " \t}\n" @@ -407,7 +416,8 @@ " \treturn irq_to_desc(irq);\n" " }\n" "Index: linux-2.6/kernel/irq/numa_migrate.c\n" - "=================================--- linux-2.6.orig/kernel/irq/numa_migrate.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/irq/numa_migrate.c\n" "+++ linux-2.6/kernel/irq/numa_migrate.c\n" "@@ -47,7 +47,8 @@ static bool init_copy_one_irq_desc(int i\n" " \tlockdep_set_class(&desc->lock, &irq_desc_lock_class);\n" @@ -435,18 +445,19 @@ " {\n" "+\n" " \t/* those static or target node is -1, do not move them */\n" - " \tif (desc->irq < NR_IRQS_LEGACY || node = -1)\n" + " \tif (desc->irq < NR_IRQS_LEGACY || node == -1)\n" " \t\treturn desc;\n" "+\t/* IRQ chip does not support movement */\n" "+\tif (desc->chip_data &&\n" - "+\t (desc->chip->copy_chip_data = NULL ||\n" - "+\t desc->chip->free_chip_data = NULL))\n" + "+\t (desc->chip->copy_chip_data == NULL ||\n" + "+\t desc->chip->free_chip_data == NULL))\n" "+\t\treturn desc;\n" " \n" " \tif (desc->node != node)\n" " \t\tdesc = __real_move_irq_desc(desc, node);\n" "Index: linux-2.6/kernel/softirq.c\n" - "=================================--- linux-2.6.orig/kernel/softirq.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/softirq.c\n" "+++ linux-2.6/kernel/softirq.c\n" "@@ -895,8 +895,3 @@ int __init __weak arch_early_irq_init(vo\n" " {\n" @@ -458,7 +469,8 @@ "-\treturn 0;\n" "-}\n" "Index: linux-2.6/kernel/irq/chip.c\n" - "=================================--- linux-2.6.orig/kernel/irq/chip.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/irq/chip.c\n" "+++ linux-2.6/kernel/irq/chip.c\n" "@@ -758,3 +758,10 @@ void __init set_irq_probe(unsigned int i\n" " \tdesc->status &= ~IRQ_NOPROBE;\n" @@ -472,4 +484,4 @@ "+}\n" + -97aacfead37dbf0ffe38f36683e8411dcda706a6fd2b042e084aa4c67d28cc42 +65505781afd9b93a69777e672bf57df42ef16e1fb6a5a6f7d89eb85229e9a430
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.