diff for duplicates of <200701270203.15772.lenb@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 132d818..7b62e95 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,8 +29,7 @@ Signed-off-by: Len Brown <len.brown@intel.com> 7 files changed, 368 insertions(+), 104 deletions(-) Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c -=================================================================== ---- acpi.orig/arch/ia64/sn/kernel/io_acpi_init.c +=================================--- acpi.orig/arch/ia64/sn/kernel/io_acpi_init.c +++ acpi/arch/ia64/sn/kernel/io_acpi_init.c @@ -13,6 +13,7 @@ #include <asm/sn/sn_sal.h> @@ -69,8 +68,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c } resource = buffer.pointer; @@ -130,8 +139,8 @@ sn_get_bussoft_ptr(struct pci_bus *bus) - if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) != - sizeof(struct pcibus_bussoft *)) { + if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) ! sizeof(struct pcibus_bussoft *)) { printk(KERN_ERR - "get_acpi_bussoft_ptr: Invalid vendor data " - "length %d\n", vendor->byte_length); @@ -110,7 +108,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c - if (!bus->parent) { /* If root bus */ - prom_bussoft_ptr = sn_get_bussoft_ptr(bus); -- if (prom_bussoft_ptr == NULL) { +- if (prom_bussoft_ptr = NULL) { + /* + * The pointer to this device's pcidev_info structure in + * the PROM, is in the vendor resource. @@ -128,8 +126,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c + + resource = buffer.pointer; + vendor = &resource->data.vendor_typed; -+ if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) != -+ sizeof(struct pci_devdev_info *)) { ++ if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !+ sizeof(struct pci_devdev_info *)) { + printk(KERN_ERR + "%s: Invalid vendor data length: %d for: ", + __FUNCTION__, vendor->byte_length); @@ -190,7 +187,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c + printk("\n"); + panic("%s: Unable to find host devfn\n", __FUNCTION__); + } -+ if (parent == rootbus_handle) ++ if (parent = rootbus_handle) + break; + child = parent; + } @@ -267,7 +264,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c + slot = (adr >> 16) & 0xffff; + function = adr & 0xffff; + devfn = PCI_DEVFN(slot, function); -+ if ((info->devfn == devfn) && (info->bus == bbn)) { ++ if ((info->devfn = devfn) && (info->bus = bbn)) { + /* We have a match! */ + info->handle = handle; + return 1; @@ -338,9 +335,8 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c + + /* Build up the pcidev_info.pdi_slot_host_handle */ + host_devfn = get_host_devfn(pcidev_match.handle, rootbus_handle); -+ (*pcidev_info)->pdi_slot_host_handle = -+ ((unsigned long) pci_domain_nr(dev) << 40) | -+ /* bus == 0 */ ++ (*pcidev_info)->pdi_slot_host_handle + ((unsigned long) pci_domain_nr(dev) << 40) | ++ /* bus = 0 */ + host_devfn; + return 0; } @@ -400,7 +396,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c + + if (!bus->parent) { /* If root bus */ + prom_bussoft_ptr = sn_get_bussoft_ptr(bus); -+ if (prom_bussoft_ptr == NULL) { ++ if (prom_bussoft_ptr = NULL) { + printk(KERN_ERR + "%s: 0x%04x:0x%02x Unable to " + "obtain prom_bussoft_ptr\n", @@ -419,8 +415,7 @@ Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c * nodes and root buses in the DSDT. As a result, bus scanning * will be initiated by the Linux ACPI code. Index: acpi/arch/ia64/sn/kernel/io_common.c -=================================================================== ---- acpi.orig/arch/ia64/sn/kernel/io_common.c +=================================--- acpi.orig/arch/ia64/sn/kernel/io_common.c +++ acpi/arch/ia64/sn/kernel/io_common.c @@ -26,14 +26,10 @@ #include <linux/acpi.h> @@ -556,7 +551,7 @@ Index: acpi/arch/ia64/sn/kernel/io_common.c + struct acpi_table_header *header = NULL; + + acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header); -+ BUG_ON(header == NULL); ++ BUG_ON(header = NULL); + sn_acpi_rev = header->oem_revision; + } + @@ -572,8 +567,7 @@ Index: acpi/arch/ia64/sn/kernel/io_common.c EXPORT_SYMBOL(sn_bus_store_sysdata); EXPORT_SYMBOL(sn_bus_free_sysdata); Index: acpi/arch/ia64/sn/kernel/io_init.c -=================================================================== ---- acpi.orig/arch/ia64/sn/kernel/io_init.c +=================================--- acpi.orig/arch/ia64/sn/kernel/io_init.c +++ acpi/arch/ia64/sn/kernel/io_init.c @@ -56,6 +56,25 @@ static inline u64 sal_get_pcibus_info(u6 return ret_stuff.v0; @@ -677,8 +671,7 @@ Index: acpi/arch/ia64/sn/kernel/io_init.c } Index: acpi/arch/ia64/sn/pci/pcibr/pcibr_provider.c -=================================================================== ---- acpi.orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c +=================================--- acpi.orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ acpi/arch/ia64/sn/pci/pcibr/pcibr_provider.c @@ -20,7 +20,8 @@ #include "xtalk/hubdev.h" @@ -701,8 +694,7 @@ Index: acpi/arch/ia64/sn/pci/pcibr/pcibr_provider.c return (int)ret_stuff.v0; } Index: acpi/include/asm-ia64/sn/acpi.h -=================================================================== ---- acpi.orig/include/asm-ia64/sn/acpi.h +=================================--- acpi.orig/include/asm-ia64/sn/acpi.h +++ acpi/include/asm-ia64/sn/acpi.h @@ -11,8 +11,7 @@ @@ -716,8 +708,7 @@ Index: acpi/include/asm-ia64/sn/acpi.h #endif /* _ASM_IA64_SN_ACPI_H */ Index: acpi/include/asm-ia64/sn/pcibr_provider.h -=================================================================== ---- acpi.orig/include/asm-ia64/sn/pcibr_provider.h +=================================--- acpi.orig/include/asm-ia64/sn/pcibr_provider.h +++ acpi/include/asm-ia64/sn/pcibr_provider.h @@ -142,7 +142,7 @@ extern int pcibr_ate_alloc(struct pcib extern void pcibr_ate_free(struct pcibus_info *, int); @@ -729,8 +720,7 @@ Index: acpi/include/asm-ia64/sn/pcibr_provider.h int action, void *resp); extern u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus); Index: acpi/include/asm-ia64/sn/pcidev.h -=================================================================== ---- acpi.orig/include/asm-ia64/sn/pcidev.h +=================================--- acpi.orig/include/asm-ia64/sn/pcidev.h +++ acpi/include/asm-ia64/sn/pcidev.h @@ -70,10 +70,16 @@ extern void sn_irq_fixup(struct pci_dev struct sn_irq_info *sn_irq_info); diff --git a/a/content_digest b/N1/content_digest index d2495a6..510cee3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0200701270157.43631.lenb@kernel.org\0" "From\0Len Brown <lenb@kernel.org>\0" "Subject\0[PATCH 2/3] Altix: ACPI SSDT PCI device support\0" - "Date\0Sat, 27 Jan 2007 02:03:15 -0500\0" + "Date\0Sat, 27 Jan 2007 07:03:15 +0000\0" "To\0Andrew Morton <akpm@osdl.org>\0" "Cc\0John Keller <jpk@sgi.com>" linux-acpi@vger.kernel.org @@ -49,8 +49,7 @@ " 7 files changed, 368 insertions(+), 104 deletions(-)\n" "\n" "Index: acpi/arch/ia64/sn/kernel/io_acpi_init.c\n" - "===================================================================\n" - "--- acpi.orig/arch/ia64/sn/kernel/io_acpi_init.c\n" + "=================================--- acpi.orig/arch/ia64/sn/kernel/io_acpi_init.c\n" "+++ acpi/arch/ia64/sn/kernel/io_acpi_init.c\n" "@@ -13,6 +13,7 @@\n" " #include <asm/sn/sn_sal.h>\n" @@ -89,8 +88,7 @@ " \t}\n" " \tresource = buffer.pointer;\n" "@@ -130,8 +139,8 @@ sn_get_bussoft_ptr(struct pci_bus *bus)\n" - " \tif ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=\n" - " \t sizeof(struct pcibus_bussoft *)) {\n" + " \tif ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) ! \t sizeof(struct pcibus_bussoft *)) {\n" " \t\tprintk(KERN_ERR\n" "-\t\t \"get_acpi_bussoft_ptr: Invalid vendor data \"\n" "-\t\t \"length %d\\n\", vendor->byte_length);\n" @@ -130,7 +128,7 @@ " \n" "-\tif (!bus->parent) {\t/* If root bus */\n" "-\t\tprom_bussoft_ptr = sn_get_bussoft_ptr(bus);\n" - "-\t\tif (prom_bussoft_ptr == NULL) {\n" + "-\t\tif (prom_bussoft_ptr = NULL) {\n" "+\t/*\n" "+\t * The pointer to this device's pcidev_info structure in\n" "+\t * the PROM, is in the vendor resource.\n" @@ -148,8 +146,7 @@ "+\n" "+\tresource = buffer.pointer;\n" "+\tvendor = &resource->data.vendor_typed;\n" - "+\tif ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=\n" - "+\t sizeof(struct pci_devdev_info *)) {\n" + "+\tif ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !+\t sizeof(struct pci_devdev_info *)) {\n" "+\t\tprintk(KERN_ERR\n" "+\t\t \"%s: Invalid vendor data length: %d for: \",\n" "+\t\t __FUNCTION__, vendor->byte_length);\n" @@ -210,7 +207,7 @@ "+\t\t\tprintk(\"\\n\");\n" "+\t\t\tpanic(\"%s: Unable to find host devfn\\n\", __FUNCTION__);\n" "+\t\t}\n" - "+\t\tif (parent == rootbus_handle)\n" + "+\t\tif (parent = rootbus_handle)\n" "+\t\t\tbreak;\n" "+\t\tchild = parent;\n" "+\t}\n" @@ -287,7 +284,7 @@ "+ slot = (adr >> 16) & 0xffff;\n" "+ function = adr & 0xffff;\n" "+ devfn = PCI_DEVFN(slot, function);\n" - "+ if ((info->devfn == devfn) && (info->bus == bbn)) {\n" + "+ if ((info->devfn = devfn) && (info->bus = bbn)) {\n" "+\t\t\t/* We have a match! */\n" "+\t\t\tinfo->handle = handle;\n" "+\t\t\treturn 1;\n" @@ -358,9 +355,8 @@ "+\n" "+\t/* Build up the pcidev_info.pdi_slot_host_handle */\n" "+\thost_devfn = get_host_devfn(pcidev_match.handle, rootbus_handle);\n" - "+\t(*pcidev_info)->pdi_slot_host_handle =\n" - "+\t\t\t((unsigned long) pci_domain_nr(dev) << 40) |\n" - "+\t\t\t\t\t/* bus == 0 */\n" + "+\t(*pcidev_info)->pdi_slot_host_handle +\t\t\t((unsigned long) pci_domain_nr(dev) << 40) |\n" + "+\t\t\t\t\t/* bus = 0 */\n" "+\t\t\t\t\thost_devfn;\n" "+\treturn 0;\n" " }\n" @@ -420,7 +416,7 @@ "+\n" "+\tif (!bus->parent) {\t/* If root bus */\n" "+\t\tprom_bussoft_ptr = sn_get_bussoft_ptr(bus);\n" - "+\t\tif (prom_bussoft_ptr == NULL) {\n" + "+\t\tif (prom_bussoft_ptr = NULL) {\n" "+\t\t\tprintk(KERN_ERR\n" "+\t\t\t \"%s: 0x%04x:0x%02x Unable to \"\n" "+\t\t\t \"obtain prom_bussoft_ptr\\n\",\n" @@ -439,8 +435,7 @@ " *\t\t nodes and root buses in the DSDT. As a result, bus scanning\n" " *\t\t will be initiated by the Linux ACPI code.\n" "Index: acpi/arch/ia64/sn/kernel/io_common.c\n" - "===================================================================\n" - "--- acpi.orig/arch/ia64/sn/kernel/io_common.c\n" + "=================================--- acpi.orig/arch/ia64/sn/kernel/io_common.c\n" "+++ acpi/arch/ia64/sn/kernel/io_common.c\n" "@@ -26,14 +26,10 @@\n" " #include <linux/acpi.h>\n" @@ -576,7 +571,7 @@ "+\t\tstruct acpi_table_header *header = NULL;\n" "+\n" "+\t\tacpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);\n" - "+\t\tBUG_ON(header == NULL);\n" + "+\t\tBUG_ON(header = NULL);\n" "+\t\tsn_acpi_rev = header->oem_revision;\n" "+\t}\n" "+\n" @@ -592,8 +587,7 @@ " EXPORT_SYMBOL(sn_bus_store_sysdata);\n" " EXPORT_SYMBOL(sn_bus_free_sysdata);\n" "Index: acpi/arch/ia64/sn/kernel/io_init.c\n" - "===================================================================\n" - "--- acpi.orig/arch/ia64/sn/kernel/io_init.c\n" + "=================================--- acpi.orig/arch/ia64/sn/kernel/io_init.c\n" "+++ acpi/arch/ia64/sn/kernel/io_init.c\n" "@@ -56,6 +56,25 @@ static inline u64 sal_get_pcibus_info(u6\n" " \treturn ret_stuff.v0;\n" @@ -697,8 +691,7 @@ " \n" " }\n" "Index: acpi/arch/ia64/sn/pci/pcibr/pcibr_provider.c\n" - "===================================================================\n" - "--- acpi.orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c\n" + "=================================--- acpi.orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c\n" "+++ acpi/arch/ia64/sn/pci/pcibr/pcibr_provider.c\n" "@@ -20,7 +20,8 @@\n" " #include \"xtalk/hubdev.h\"\n" @@ -721,8 +714,7 @@ " \treturn (int)ret_stuff.v0;\n" " }\n" "Index: acpi/include/asm-ia64/sn/acpi.h\n" - "===================================================================\n" - "--- acpi.orig/include/asm-ia64/sn/acpi.h\n" + "=================================--- acpi.orig/include/asm-ia64/sn/acpi.h\n" "+++ acpi/include/asm-ia64/sn/acpi.h\n" "@@ -11,8 +11,7 @@\n" " \n" @@ -736,8 +728,7 @@ " \n" " #endif /* _ASM_IA64_SN_ACPI_H */\n" "Index: acpi/include/asm-ia64/sn/pcibr_provider.h\n" - "===================================================================\n" - "--- acpi.orig/include/asm-ia64/sn/pcibr_provider.h\n" + "=================================--- acpi.orig/include/asm-ia64/sn/pcibr_provider.h\n" "+++ acpi/include/asm-ia64/sn/pcibr_provider.h\n" "@@ -142,7 +142,7 @@ extern int \t\tpcibr_ate_alloc(struct pcib\n" " extern void \t\tpcibr_ate_free(struct pcibus_info *, int);\n" @@ -749,8 +740,7 @@ " \t\t\t\t int action, void *resp);\n" " extern u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus);\n" "Index: acpi/include/asm-ia64/sn/pcidev.h\n" - "===================================================================\n" - "--- acpi.orig/include/asm-ia64/sn/pcidev.h\n" + "=================================--- acpi.orig/include/asm-ia64/sn/pcidev.h\n" "+++ acpi/include/asm-ia64/sn/pcidev.h\n" "@@ -70,10 +70,16 @@ extern void sn_irq_fixup(struct pci_dev \n" " \t\t\t struct sn_irq_info *sn_irq_info);\n" @@ -771,4 +761,4 @@ " extern void sn_irq_lh_init(void);\n" " #endif\t\t\t\t/* _ASM_IA64_SN_PCI_PCIDEV_H */" -9aa55ce6a88102f16c14758b8d87660cfd2fe9b7edbfc76140a3f4cd63b7c1c4 +a84553b55109c7a510a43eec75ac4b665f09d791b9fe28988bcc930a5042171c
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.