diff for duplicates of <49F65560.20904@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 8d3b79e..cdc6c86 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,8 +21,7 @@ Cc: Tony Luck <tony.luck@intel.com> 9 files changed, 21 insertions(+), 16 deletions(-) Index: linux-2.6/arch/ia64/kernel/acpi.c -=================================================================== ---- linux-2.6.orig/arch/ia64/kernel/acpi.c +=================================--- linux-2.6.orig/arch/ia64/kernel/acpi.c +++ linux-2.6/arch/ia64/kernel/acpi.c @@ -636,7 +636,7 @@ void __init acpi_numa_arch_fixup(void) * success: return IRQ number (>=0) @@ -31,7 +30,7 @@ Index: linux-2.6/arch/ia64/kernel/acpi.c -int acpi_register_gsi(u32 gsi, int triggering, int polarity) +int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity) { - if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) + if (acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM) return gsi; @@ -678,7 +678,8 @@ static int __init acpi_parse_fadt(struct @@ -44,8 +43,7 @@ Index: linux-2.6/arch/ia64/kernel/acpi.c } Index: linux-2.6/arch/x86/include/asm/io_apic.h -=================================================================== ---- linux-2.6.orig/arch/x86/include/asm/io_apic.h +=================================--- linux-2.6.orig/arch/x86/include/asm/io_apic.h +++ linux-2.6/arch/x86/include/asm/io_apic.h @@ -154,8 +154,8 @@ extern int timer_through_8259; extern int io_apic_get_unique_id(int ioapic, int apic_id); @@ -59,8 +57,7 @@ Index: linux-2.6/arch/x86/include/asm/io_apic.h extern int (*ioapic_renumber_irq)(int ioapic, int irq); Index: linux-2.6/arch/x86/include/asm/mpspec.h -=================================================================== ---- linux-2.6.orig/arch/x86/include/asm/mpspec.h +=================================--- linux-2.6.orig/arch/x86/include/asm/mpspec.h +++ linux-2.6/arch/x86/include/asm/mpspec.h @@ -72,7 +72,9 @@ extern void mp_register_ioapic(int id, u extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, @@ -74,8 +71,7 @@ Index: linux-2.6/arch/x86/include/asm/mpspec.h #ifdef CONFIG_X86_IO_APIC extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, Index: linux-2.6/arch/x86/kernel/acpi/boot.c -=================================================================== ---- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +=================================--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +++ linux-2.6/arch/x86/kernel/acpi/boot.c @@ -522,7 +522,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned in * success: return IRQ number (>=0) @@ -89,7 +85,7 @@ Index: linux-2.6/arch/x86/kernel/acpi/boot.c @@ -539,7 +539,7 @@ int acpi_register_gsi(u32 gsi, int trigg #ifdef CONFIG_X86_IO_APIC - if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) { + if (acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC) { - plat_gsi = mp_register_gsi(gsi, triggering, polarity); + plat_gsi = mp_register_gsi(dev, gsi, triggering, polarity); } @@ -110,12 +106,11 @@ Index: linux-2.6/arch/x86/kernel/acpi/boot.c #endif - io_apic_set_pci_routing(ioapic, ioapic_pin, gsi, + io_apic_set_pci_routing(dev, ioapic, ioapic_pin, gsi, - triggering == ACPI_EDGE_SENSITIVE ? 0 : 1, - polarity == ACPI_ACTIVE_HIGH ? 0 : 1); + triggering = ACPI_EDGE_SENSITIVE ? 0 : 1, + polarity = ACPI_ACTIVE_HIGH ? 0 : 1); return gsi; 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 @@ -3916,7 +3916,8 @@ int __init io_apic_get_version(int ioapi } @@ -128,8 +123,7 @@ Index: linux-2.6/arch/x86/kernel/apic/io_apic.c struct irq_desc *desc; struct irq_cfg *cfg; Index: linux-2.6/drivers/acpi/pci_irq.c -=================================================================== ---- linux-2.6.orig/drivers/acpi/pci_irq.c +=================================--- linux-2.6.orig/drivers/acpi/pci_irq.c +++ linux-2.6/drivers/acpi/pci_irq.c @@ -401,7 +401,8 @@ int acpi_pci_irq_enable(struct pci_dev * /* Interrupt Line values above 0xF are forbidden */ @@ -151,8 +145,7 @@ Index: linux-2.6/drivers/acpi/pci_irq.c dev_warn(&dev->dev, "PCI INT %c: failed to register GSI\n", pin_name(pin)); Index: linux-2.6/drivers/char/hpet.c -=================================================================== ---- linux-2.6.orig/drivers/char/hpet.c +=================================--- linux-2.6.orig/drivers/char/hpet.c +++ linux-2.6/drivers/char/hpet.c @@ -224,7 +224,7 @@ static void hpet_timer_set_irq(struct hp break; @@ -173,8 +166,7 @@ Index: linux-2.6/drivers/char/hpet.c if (irq < 0) return AE_ERROR; Index: linux-2.6/drivers/pnp/pnpacpi/rsparser.c -=================================================================== ---- linux-2.6.orig/drivers/pnp/pnpacpi/rsparser.c +=================================--- linux-2.6.orig/drivers/pnp/pnpacpi/rsparser.c +++ linux-2.6/drivers/pnp/pnpacpi/rsparser.c @@ -123,7 +123,7 @@ static void pnpacpi_parse_allocated_irqr } @@ -186,8 +178,7 @@ Index: linux-2.6/drivers/pnp/pnpacpi/rsparser.c pcibios_penalize_isa_irq(irq, 1); else Index: linux-2.6/include/linux/acpi.h -=================================================================== ---- linux-2.6.orig/include/linux/acpi.h +=================================--- linux-2.6.orig/include/linux/acpi.h +++ linux-2.6/include/linux/acpi.h @@ -119,7 +119,7 @@ extern int pci_mmcfg_config_num; extern int sbf_port; diff --git a/a/content_digest b/N1/content_digest index e951e76..cb968a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\049E80457.5060403@kernel.org\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" "Subject\0[PATCH 6/9] irq: make io_apic_set_pci_routing to take device\0" - "Date\0Mon, 27 Apr 2009 18:01:20 -0700\0" + "Date\0Tue, 28 Apr 2009 01:01:20 +0000\0" "To\0Ingo Molnar <mingo@elte.hu>" Thomas Gleixner <tglx@linutronix.de> H. Peter Anvin <hpa@zytor.com> @@ -38,8 +38,7 @@ " 9 files changed, 21 insertions(+), 16 deletions(-)\n" "\n" "Index: linux-2.6/arch/ia64/kernel/acpi.c\n" - "===================================================================\n" - "--- linux-2.6.orig/arch/ia64/kernel/acpi.c\n" + "=================================--- linux-2.6.orig/arch/ia64/kernel/acpi.c\n" "+++ linux-2.6/arch/ia64/kernel/acpi.c\n" "@@ -636,7 +636,7 @@ void __init acpi_numa_arch_fixup(void)\n" " * success: return IRQ number (>=0)\n" @@ -48,7 +47,7 @@ "-int acpi_register_gsi(u32 gsi, int triggering, int polarity)\n" "+int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)\n" " {\n" - " \tif (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)\n" + " \tif (acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM)\n" " \t\treturn gsi;\n" "@@ -678,7 +678,8 @@ static int __init acpi_parse_fadt(struct\n" " \n" @@ -61,8 +60,7 @@ " }\n" " \n" "Index: linux-2.6/arch/x86/include/asm/io_apic.h\n" - "===================================================================\n" - "--- linux-2.6.orig/arch/x86/include/asm/io_apic.h\n" + "=================================--- linux-2.6.orig/arch/x86/include/asm/io_apic.h\n" "+++ linux-2.6/arch/x86/include/asm/io_apic.h\n" "@@ -154,8 +154,8 @@ extern int timer_through_8259;\n" " extern int io_apic_get_unique_id(int ioapic, int apic_id);\n" @@ -76,8 +74,7 @@ " \n" " extern int (*ioapic_renumber_irq)(int ioapic, int irq);\n" "Index: linux-2.6/arch/x86/include/asm/mpspec.h\n" - "===================================================================\n" - "--- linux-2.6.orig/arch/x86/include/asm/mpspec.h\n" + "=================================--- linux-2.6.orig/arch/x86/include/asm/mpspec.h\n" "+++ linux-2.6/arch/x86/include/asm/mpspec.h\n" "@@ -72,7 +72,9 @@ extern void mp_register_ioapic(int id, u\n" " extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,\n" @@ -91,8 +88,7 @@ " #ifdef CONFIG_X86_IO_APIC\n" " extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin,\n" "Index: linux-2.6/arch/x86/kernel/acpi/boot.c\n" - "===================================================================\n" - "--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c\n" + "=================================--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c\n" "+++ linux-2.6/arch/x86/kernel/acpi/boot.c\n" "@@ -522,7 +522,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned in\n" " * success: return IRQ number (>=0)\n" @@ -106,7 +102,7 @@ "@@ -539,7 +539,7 @@ int acpi_register_gsi(u32 gsi, int trigg\n" " \n" " #ifdef CONFIG_X86_IO_APIC\n" - " \tif (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {\n" + " \tif (acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC) {\n" "-\t\tplat_gsi = mp_register_gsi(gsi, triggering, polarity);\n" "+\t\tplat_gsi = mp_register_gsi(dev, gsi, triggering, polarity);\n" " \t}\n" @@ -127,12 +123,11 @@ " #endif\n" "-\tio_apic_set_pci_routing(ioapic, ioapic_pin, gsi,\n" "+\tio_apic_set_pci_routing(dev, ioapic, ioapic_pin, gsi,\n" - " \t\t\t\ttriggering == ACPI_EDGE_SENSITIVE ? 0 : 1,\n" - " \t\t\t\tpolarity == ACPI_ACTIVE_HIGH ? 0 : 1);\n" + " \t\t\t\ttriggering = ACPI_EDGE_SENSITIVE ? 0 : 1,\n" + " \t\t\t\tpolarity = ACPI_ACTIVE_HIGH ? 0 : 1);\n" " \treturn gsi;\n" "Index: linux-2.6/arch/x86/kernel/apic/io_apic.c\n" - "===================================================================\n" - "--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c\n" + "=================================--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c\n" "+++ linux-2.6/arch/x86/kernel/apic/io_apic.c\n" "@@ -3916,7 +3916,8 @@ int __init io_apic_get_version(int ioapi\n" " }\n" @@ -145,8 +140,7 @@ " \tstruct irq_desc *desc;\n" " \tstruct irq_cfg *cfg;\n" "Index: linux-2.6/drivers/acpi/pci_irq.c\n" - "===================================================================\n" - "--- linux-2.6.orig/drivers/acpi/pci_irq.c\n" + "=================================--- linux-2.6.orig/drivers/acpi/pci_irq.c\n" "+++ linux-2.6/drivers/acpi/pci_irq.c\n" "@@ -401,7 +401,8 @@ int acpi_pci_irq_enable(struct pci_dev *\n" " \t\t/* Interrupt Line values above 0xF are forbidden */\n" @@ -168,8 +162,7 @@ " \t\tdev_warn(&dev->dev, \"PCI INT %c: failed to register GSI\\n\",\n" " \t\t\t pin_name(pin));\n" "Index: linux-2.6/drivers/char/hpet.c\n" - "===================================================================\n" - "--- linux-2.6.orig/drivers/char/hpet.c\n" + "=================================--- linux-2.6.orig/drivers/char/hpet.c\n" "+++ linux-2.6/drivers/char/hpet.c\n" "@@ -224,7 +224,7 @@ static void hpet_timer_set_irq(struct hp\n" " \t\t\tbreak;\n" @@ -190,8 +183,7 @@ " \t\t\tif (irq < 0)\n" " \t\t\t\treturn AE_ERROR;\n" "Index: linux-2.6/drivers/pnp/pnpacpi/rsparser.c\n" - "===================================================================\n" - "--- linux-2.6.orig/drivers/pnp/pnpacpi/rsparser.c\n" + "=================================--- linux-2.6.orig/drivers/pnp/pnpacpi/rsparser.c\n" "+++ linux-2.6/drivers/pnp/pnpacpi/rsparser.c\n" "@@ -123,7 +123,7 @@ static void pnpacpi_parse_allocated_irqr\n" " \t}\n" @@ -203,8 +195,7 @@ " \t\tpcibios_penalize_isa_irq(irq, 1);\n" " \telse\n" "Index: linux-2.6/include/linux/acpi.h\n" - "===================================================================\n" - "--- linux-2.6.orig/include/linux/acpi.h\n" + "=================================--- linux-2.6.orig/include/linux/acpi.h\n" "+++ linux-2.6/include/linux/acpi.h\n" "@@ -119,7 +119,7 @@ extern int pci_mmcfg_config_num;\n" " extern int sbf_port;\n" @@ -216,4 +207,4 @@ " \n" #ifdef CONFIG_X86_IO_APIC -51abe3aba7941f89020bf16cbc366b0417de08e7160677e6852575ff6bfe43de +90d5dc8a59d2c434e01a749aa716ead7322cd71382ed4a41b3fa4a596df60eba
diff --git a/a/content_digest b/N2/content_digest index e951e76..efb1a5f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -9,7 +9,12 @@ Thomas Gleixner <tglx@linutronix.de> H. Peter Anvin <hpa@zytor.com> Andrew Morton <akpm@linux-foundation.org> - " Suresh Siddha <suresh.b.siddha@intel.co>\0" + Suresh Siddha <suresh.b.siddha@intel.com> + Eric W. Biederman <ebiederm@xmission.com> + Rusty Russell <rusty@rustcorp.com.au> + Len Brown <lenb@kernel.org> + Bjorn Helgaas <bjorn.helgaas@hp.com> + " Tony Luck <tony.luck@intel.com>\0" "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>" ACPI Devel Maling List <linux-acpi@vger.kernel.org> " linux-ia64@vger.kernel.org\0" @@ -216,4 +221,4 @@ " \n" #ifdef CONFIG_X86_IO_APIC -51abe3aba7941f89020bf16cbc366b0417de08e7160677e6852575ff6bfe43de +a2d419bc6eb0182a3623e8df1d4f5e95068e6089bbf9a5be57a1e0f75a25cb81
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.