diff for duplicates of <20060321193842.GF22524@sgi.com> diff --git a/a/1.txt b/N1/1.txt index d445fe1..26c4ddd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,8 @@ basis. Signed-off-by: Mark Maule <maule@sgi.com> Index: linux-2.6.16/drivers/pci/msi.c -=================================--- linux-2.6.16.orig/drivers/pci/msi.c 2006-03-21 11:13:59.726139722 -0600 +=================================================================== +--- linux-2.6.16.orig/drivers/pci/msi.c 2006-03-21 11:13:59.726139722 -0600 +++ linux-2.6.16/drivers/pci/msi.c 2006-03-21 11:14:06.210856320 -0600 @@ -23,8 +23,6 @@ #include "pci.h" @@ -101,9 +102,11 @@ Index: linux-2.6.16/drivers/pci/msi.c { - int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + - PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET; -+ int offset_hi + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + ++ int offset_hi = ++ entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET; -+ int offset_lo + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + ++ int offset_lo = ++ entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET; + + address_hi = readl(entry->mask_base + offset_hi); @@ -252,7 +255,8 @@ Index: linux-2.6.16/drivers/pci/msi.c /* Configure MSI-X capability structure */ - msi_address_init(&address); - msi_data_init(&data, vector); -- entry->msi_attrib.current_cpu - ((address.lo_address.u.dest_id >> +- entry->msi_attrib.current_cpu = +- ((address.lo_address.u.dest_id >> - MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK); - writel(address.lo_address.value, + status = msi_ops->setup(dev, vector, @@ -284,7 +288,8 @@ Index: linux-2.6.16/drivers/pci/msi.c entry = msi_desc[vector]; if (!entry || entry->dev != dev) { Index: linux-2.6.16/include/asm-i386/msi.h -=================================--- linux-2.6.16.orig/include/asm-i386/msi.h 2006-03-21 11:13:59.727116189 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-i386/msi.h 2006-03-21 11:13:59.727116189 -0600 +++ linux-2.6.16/include/asm-i386/msi.h 2006-03-21 11:14:06.213785721 -0600 @@ -12,4 +12,12 @@ #define LAST_DEVICE_VECTOR 232 @@ -300,7 +305,8 @@ Index: linux-2.6.16/include/asm-i386/msi.h + #endif /* ASM_MSI_H */ Index: linux-2.6.16/include/asm-x86_64/msi.h -=================================--- linux-2.6.16.orig/include/asm-x86_64/msi.h 2006-03-21 11:13:59.728092656 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-x86_64/msi.h 2006-03-21 11:13:59.728092656 -0600 +++ linux-2.6.16/include/asm-x86_64/msi.h 2006-03-21 11:14:06.214762188 -0600 @@ -13,4 +13,12 @@ #define LAST_DEVICE_VECTOR 232 @@ -316,7 +322,8 @@ Index: linux-2.6.16/include/asm-x86_64/msi.h + #endif /* ASM_MSI_H */ Index: linux-2.6.16/include/asm-ia64/machvec.h -=================================--- linux-2.6.16.orig/include/asm-ia64/machvec.h 2006-03-21 11:13:59.728092656 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-ia64/machvec.h 2006-03-21 11:13:59.728092656 -0600 +++ linux-2.6.16/include/asm-ia64/machvec.h 2006-03-21 11:14:57.089663570 -0600 @@ -74,6 +74,7 @@ typedef unsigned short ia64_mv_readw_relaxed_t (const volatile void __iomem *); @@ -360,7 +367,8 @@ Index: linux-2.6.16/include/asm-ia64/machvec.h #endif /* _ASM_IA64_MACHVEC_H */ Index: linux-2.6.16/include/asm-ia64/machvec_sn2.h -=================================--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h 2006-03-21 11:13:59.728092656 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h 2006-03-21 11:13:59.728092656 -0600 +++ linux-2.6.16/include/asm-ia64/machvec_sn2.h 2006-03-21 13:26:22.138073104 -0600 @@ -66,6 +66,7 @@ extern ia64_mv_dma_sync_sg_for_device sn_dma_sync_sg_for_device; @@ -383,7 +391,8 @@ Index: linux-2.6.16/include/asm-ia64/machvec_sn2.h #include <asm/sn/io.h> Index: linux-2.6.16/include/asm-ia64/msi.h -=================================--- linux-2.6.16.orig/include/asm-ia64/msi.h 2006-03-21 11:13:59.729069123 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-ia64/msi.h 2006-03-21 11:13:59.729069123 -0600 +++ linux-2.6.16/include/asm-ia64/msi.h 2006-03-21 11:14:06.217691588 -0600 @@ -14,4 +14,16 @@ #define ack_APIC_irq ia64_eoi @@ -403,7 +412,8 @@ Index: linux-2.6.16/include/asm-ia64/msi.h + #endif /* ASM_MSI_H */ Index: linux-2.6.16/drivers/pci/Makefile -=================================--- linux-2.6.16.orig/drivers/pci/Makefile 2006-03-21 11:13:59.726139722 -0600 +=================================================================== +--- linux-2.6.16.orig/drivers/pci/Makefile 2006-03-21 11:13:59.726139722 -0600 +++ linux-2.6.16/drivers/pci/Makefile 2006-03-21 11:14:06.217691588 -0600 @@ -26,7 +26,11 @@ obj-$(CONFIG_PPC64) += setup-bus.o @@ -419,7 +429,8 @@ Index: linux-2.6.16/drivers/pci/Makefile # # ACPI Related PCI FW Functions Index: linux-2.6.16/drivers/pci/msi-apic.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.16/drivers/pci/msi-apic.c 2006-03-21 11:14:06.220620989 -0600 @@ -0,0 +1,100 @@ +/* @@ -523,7 +534,8 @@ Index: linux-2.6.16/drivers/pci/msi-apic.c + .target = msi_target_apic, +}; Index: linux-2.6.16/drivers/pci/msi.h -=================================--- linux-2.6.16.orig/drivers/pci/msi.h 2006-03-21 11:13:59.727116189 -0600 +=================================================================== +--- linux-2.6.16.orig/drivers/pci/msi.h 2006-03-21 11:13:59.727116189 -0600 +++ linux-2.6.16/drivers/pci/msi.h 2006-03-21 11:14:06.223550390 -0600 @@ -6,6 +6,68 @@ #ifndef MSI_H @@ -672,7 +684,8 @@ Index: linux-2.6.16/drivers/pci/msi.h struct { Index: linux-2.6.16/drivers/pci/msi-altix.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.16/drivers/pci/msi-altix.c 2006-03-21 11:14:06.229409191 -0600 @@ -0,0 +1,18 @@ +/* diff --git a/a/content_digest b/N1/content_digest index 3207307..0a30afa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,10 +6,9 @@ "ref\0442052C0.8050304@ce.jp.nec.com\0" "From\0Mark Maule <maule@sgi.com>\0" "Subject\0Re: [PATCH 1/3] msi vector targeting abstractions\0" - "Date\0Tue, 21 Mar 2006 19:38:42 +0000\0" + "Date\0Tue, 21 Mar 2006 13:38:42 -0600\0" "To\0Jun'ichi Nomura <j-nomura@ce.jp.nec.com>\0" - "Cc\0Andreas Schwab <schwab@suse.de>" - Tony Luck <tony.luck@intel.com> + "Cc\0Tony Luck <tony.luck@intel.com>" linux-ia64@vger.kernel.org gregkh@suse.de linux-kernel@vger.kernel.org @@ -56,7 +55,8 @@ "Signed-off-by: Mark Maule <maule@sgi.com>\n" "\n" "Index: linux-2.6.16/drivers/pci/msi.c\n" - "=================================--- linux-2.6.16.orig/drivers/pci/msi.c\t2006-03-21 11:13:59.726139722 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/drivers/pci/msi.c\t2006-03-21 11:13:59.726139722 -0600\n" "+++ linux-2.6.16/drivers/pci/msi.c\t2006-03-21 11:14:06.210856320 -0600\n" "@@ -23,8 +23,6 @@\n" " #include \"pci.h\"\n" @@ -120,9 +120,11 @@ " \t{\n" "-\t\tint offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "-\t\t\tPCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;\n" - "+\t\tint offset_hi +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" + "+\t\tint offset_hi =\n" + "+\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "+\t\t\t\tPCI_MSIX_ENTRY_UPPER_ADDR_OFFSET;\n" - "+\t\tint offset_lo +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" + "+\t\tint offset_lo =\n" + "+\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "+\t\t\t\tPCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;\n" "+\n" "+\t\taddress_hi = readl(entry->mask_base + offset_hi);\n" @@ -271,7 +273,8 @@ " \t\t/* Configure MSI-X capability structure */\n" "-\t\tmsi_address_init(&address);\n" "-\t\tmsi_data_init(&data, vector);\n" - "-\t\tentry->msi_attrib.current_cpu -\t\t\t((address.lo_address.u.dest_id >>\n" + "-\t\tentry->msi_attrib.current_cpu =\n" + "-\t\t\t((address.lo_address.u.dest_id >>\n" "-\t\t\tMSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);\n" "-\t\twritel(address.lo_address.value,\n" "+\t\tstatus = msi_ops->setup(dev, vector,\n" @@ -303,7 +306,8 @@ " \tentry = msi_desc[vector];\n" " \tif (!entry || entry->dev != dev) {\n" "Index: linux-2.6.16/include/asm-i386/msi.h\n" - "=================================--- linux-2.6.16.orig/include/asm-i386/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-i386/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" "+++ linux-2.6.16/include/asm-i386/msi.h\t2006-03-21 11:14:06.213785721 -0600\n" "@@ -12,4 +12,12 @@\n" " #define LAST_DEVICE_VECTOR\t\t232\n" @@ -319,7 +323,8 @@ "+\n" " #endif /* ASM_MSI_H */\n" "Index: linux-2.6.16/include/asm-x86_64/msi.h\n" - "=================================--- linux-2.6.16.orig/include/asm-x86_64/msi.h\t2006-03-21 11:13:59.728092656 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-x86_64/msi.h\t2006-03-21 11:13:59.728092656 -0600\n" "+++ linux-2.6.16/include/asm-x86_64/msi.h\t2006-03-21 11:14:06.214762188 -0600\n" "@@ -13,4 +13,12 @@\n" " #define LAST_DEVICE_VECTOR\t\t232\n" @@ -335,7 +340,8 @@ "+\n" " #endif /* ASM_MSI_H */\n" "Index: linux-2.6.16/include/asm-ia64/machvec.h\n" - "=================================--- linux-2.6.16.orig/include/asm-ia64/machvec.h\t2006-03-21 11:13:59.728092656 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-ia64/machvec.h\t2006-03-21 11:13:59.728092656 -0600\n" "+++ linux-2.6.16/include/asm-ia64/machvec.h\t2006-03-21 11:14:57.089663570 -0600\n" "@@ -74,6 +74,7 @@\n" " typedef unsigned short ia64_mv_readw_relaxed_t (const volatile void __iomem *);\n" @@ -379,7 +385,8 @@ " \n" " #endif /* _ASM_IA64_MACHVEC_H */\n" "Index: linux-2.6.16/include/asm-ia64/machvec_sn2.h\n" - "=================================--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h\t2006-03-21 11:13:59.728092656 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h\t2006-03-21 11:13:59.728092656 -0600\n" "+++ linux-2.6.16/include/asm-ia64/machvec_sn2.h\t2006-03-21 13:26:22.138073104 -0600\n" "@@ -66,6 +66,7 @@\n" " extern ia64_mv_dma_sync_sg_for_device\tsn_dma_sync_sg_for_device;\n" @@ -402,7 +409,8 @@ " #include <asm/sn/io.h>\n" " \n" "Index: linux-2.6.16/include/asm-ia64/msi.h\n" - "=================================--- linux-2.6.16.orig/include/asm-ia64/msi.h\t2006-03-21 11:13:59.729069123 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-ia64/msi.h\t2006-03-21 11:13:59.729069123 -0600\n" "+++ linux-2.6.16/include/asm-ia64/msi.h\t2006-03-21 11:14:06.217691588 -0600\n" "@@ -14,4 +14,16 @@\n" " #define ack_APIC_irq\t\tia64_eoi\n" @@ -422,7 +430,8 @@ "+\n" " #endif /* ASM_MSI_H */\n" "Index: linux-2.6.16/drivers/pci/Makefile\n" - "=================================--- linux-2.6.16.orig/drivers/pci/Makefile\t2006-03-21 11:13:59.726139722 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/drivers/pci/Makefile\t2006-03-21 11:13:59.726139722 -0600\n" "+++ linux-2.6.16/drivers/pci/Makefile\t2006-03-21 11:14:06.217691588 -0600\n" "@@ -26,7 +26,11 @@\n" " obj-$(CONFIG_PPC64) += setup-bus.o\n" @@ -438,7 +447,8 @@ " #\n" " # ACPI Related PCI FW Functions\n" "Index: linux-2.6.16/drivers/pci/msi-apic.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.16/drivers/pci/msi-apic.c\t2006-03-21 11:14:06.220620989 -0600\n" "@@ -0,0 +1,100 @@\n" "+/*\n" @@ -542,7 +552,8 @@ "+\t.target = msi_target_apic,\n" "+};\n" "Index: linux-2.6.16/drivers/pci/msi.h\n" - "=================================--- linux-2.6.16.orig/drivers/pci/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/drivers/pci/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" "+++ linux-2.6.16/drivers/pci/msi.h\t2006-03-21 11:14:06.223550390 -0600\n" "@@ -6,6 +6,68 @@\n" " #ifndef MSI_H\n" @@ -691,7 +702,8 @@ " \n" " \tstruct {\n" "Index: linux-2.6.16/drivers/pci/msi-altix.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.16/drivers/pci/msi-altix.c\t2006-03-21 11:14:06.229409191 -0600\n" "@@ -0,0 +1,18 @@\n" "+/*\n" @@ -713,4 +725,4 @@ "+\treturn -EINVAL;\n" +} -b2c0780e83e2412ab7d6f443f9a681abf46112f12f8110fb0f8eac825ebe4237 +0ed34bfb53a17865a848fc1eec6fa745db2956632b2401e487c92f788b3b5c48
diff --git a/a/1.txt b/N2/1.txt index d445fe1..26c4ddd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -37,7 +37,8 @@ basis. Signed-off-by: Mark Maule <maule@sgi.com> Index: linux-2.6.16/drivers/pci/msi.c -=================================--- linux-2.6.16.orig/drivers/pci/msi.c 2006-03-21 11:13:59.726139722 -0600 +=================================================================== +--- linux-2.6.16.orig/drivers/pci/msi.c 2006-03-21 11:13:59.726139722 -0600 +++ linux-2.6.16/drivers/pci/msi.c 2006-03-21 11:14:06.210856320 -0600 @@ -23,8 +23,6 @@ #include "pci.h" @@ -101,9 +102,11 @@ Index: linux-2.6.16/drivers/pci/msi.c { - int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + - PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET; -+ int offset_hi + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + ++ int offset_hi = ++ entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET; -+ int offset_lo + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + ++ int offset_lo = ++ entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET; + + address_hi = readl(entry->mask_base + offset_hi); @@ -252,7 +255,8 @@ Index: linux-2.6.16/drivers/pci/msi.c /* Configure MSI-X capability structure */ - msi_address_init(&address); - msi_data_init(&data, vector); -- entry->msi_attrib.current_cpu - ((address.lo_address.u.dest_id >> +- entry->msi_attrib.current_cpu = +- ((address.lo_address.u.dest_id >> - MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK); - writel(address.lo_address.value, + status = msi_ops->setup(dev, vector, @@ -284,7 +288,8 @@ Index: linux-2.6.16/drivers/pci/msi.c entry = msi_desc[vector]; if (!entry || entry->dev != dev) { Index: linux-2.6.16/include/asm-i386/msi.h -=================================--- linux-2.6.16.orig/include/asm-i386/msi.h 2006-03-21 11:13:59.727116189 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-i386/msi.h 2006-03-21 11:13:59.727116189 -0600 +++ linux-2.6.16/include/asm-i386/msi.h 2006-03-21 11:14:06.213785721 -0600 @@ -12,4 +12,12 @@ #define LAST_DEVICE_VECTOR 232 @@ -300,7 +305,8 @@ Index: linux-2.6.16/include/asm-i386/msi.h + #endif /* ASM_MSI_H */ Index: linux-2.6.16/include/asm-x86_64/msi.h -=================================--- linux-2.6.16.orig/include/asm-x86_64/msi.h 2006-03-21 11:13:59.728092656 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-x86_64/msi.h 2006-03-21 11:13:59.728092656 -0600 +++ linux-2.6.16/include/asm-x86_64/msi.h 2006-03-21 11:14:06.214762188 -0600 @@ -13,4 +13,12 @@ #define LAST_DEVICE_VECTOR 232 @@ -316,7 +322,8 @@ Index: linux-2.6.16/include/asm-x86_64/msi.h + #endif /* ASM_MSI_H */ Index: linux-2.6.16/include/asm-ia64/machvec.h -=================================--- linux-2.6.16.orig/include/asm-ia64/machvec.h 2006-03-21 11:13:59.728092656 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-ia64/machvec.h 2006-03-21 11:13:59.728092656 -0600 +++ linux-2.6.16/include/asm-ia64/machvec.h 2006-03-21 11:14:57.089663570 -0600 @@ -74,6 +74,7 @@ typedef unsigned short ia64_mv_readw_relaxed_t (const volatile void __iomem *); @@ -360,7 +367,8 @@ Index: linux-2.6.16/include/asm-ia64/machvec.h #endif /* _ASM_IA64_MACHVEC_H */ Index: linux-2.6.16/include/asm-ia64/machvec_sn2.h -=================================--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h 2006-03-21 11:13:59.728092656 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h 2006-03-21 11:13:59.728092656 -0600 +++ linux-2.6.16/include/asm-ia64/machvec_sn2.h 2006-03-21 13:26:22.138073104 -0600 @@ -66,6 +66,7 @@ extern ia64_mv_dma_sync_sg_for_device sn_dma_sync_sg_for_device; @@ -383,7 +391,8 @@ Index: linux-2.6.16/include/asm-ia64/machvec_sn2.h #include <asm/sn/io.h> Index: linux-2.6.16/include/asm-ia64/msi.h -=================================--- linux-2.6.16.orig/include/asm-ia64/msi.h 2006-03-21 11:13:59.729069123 -0600 +=================================================================== +--- linux-2.6.16.orig/include/asm-ia64/msi.h 2006-03-21 11:13:59.729069123 -0600 +++ linux-2.6.16/include/asm-ia64/msi.h 2006-03-21 11:14:06.217691588 -0600 @@ -14,4 +14,16 @@ #define ack_APIC_irq ia64_eoi @@ -403,7 +412,8 @@ Index: linux-2.6.16/include/asm-ia64/msi.h + #endif /* ASM_MSI_H */ Index: linux-2.6.16/drivers/pci/Makefile -=================================--- linux-2.6.16.orig/drivers/pci/Makefile 2006-03-21 11:13:59.726139722 -0600 +=================================================================== +--- linux-2.6.16.orig/drivers/pci/Makefile 2006-03-21 11:13:59.726139722 -0600 +++ linux-2.6.16/drivers/pci/Makefile 2006-03-21 11:14:06.217691588 -0600 @@ -26,7 +26,11 @@ obj-$(CONFIG_PPC64) += setup-bus.o @@ -419,7 +429,8 @@ Index: linux-2.6.16/drivers/pci/Makefile # # ACPI Related PCI FW Functions Index: linux-2.6.16/drivers/pci/msi-apic.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.16/drivers/pci/msi-apic.c 2006-03-21 11:14:06.220620989 -0600 @@ -0,0 +1,100 @@ +/* @@ -523,7 +534,8 @@ Index: linux-2.6.16/drivers/pci/msi-apic.c + .target = msi_target_apic, +}; Index: linux-2.6.16/drivers/pci/msi.h -=================================--- linux-2.6.16.orig/drivers/pci/msi.h 2006-03-21 11:13:59.727116189 -0600 +=================================================================== +--- linux-2.6.16.orig/drivers/pci/msi.h 2006-03-21 11:13:59.727116189 -0600 +++ linux-2.6.16/drivers/pci/msi.h 2006-03-21 11:14:06.223550390 -0600 @@ -6,6 +6,68 @@ #ifndef MSI_H @@ -672,7 +684,8 @@ Index: linux-2.6.16/drivers/pci/msi.h struct { Index: linux-2.6.16/drivers/pci/msi-altix.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.16/drivers/pci/msi-altix.c 2006-03-21 11:14:06.229409191 -0600 @@ -0,0 +1,18 @@ +/* diff --git a/a/content_digest b/N2/content_digest index 3207307..b93ca4c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,7 +6,7 @@ "ref\0442052C0.8050304@ce.jp.nec.com\0" "From\0Mark Maule <maule@sgi.com>\0" "Subject\0Re: [PATCH 1/3] msi vector targeting abstractions\0" - "Date\0Tue, 21 Mar 2006 19:38:42 +0000\0" + "Date\0Tue, 21 Mar 2006 13:38:42 -0600\0" "To\0Jun'ichi Nomura <j-nomura@ce.jp.nec.com>\0" "Cc\0Andreas Schwab <schwab@suse.de>" Tony Luck <tony.luck@intel.com> @@ -56,7 +56,8 @@ "Signed-off-by: Mark Maule <maule@sgi.com>\n" "\n" "Index: linux-2.6.16/drivers/pci/msi.c\n" - "=================================--- linux-2.6.16.orig/drivers/pci/msi.c\t2006-03-21 11:13:59.726139722 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/drivers/pci/msi.c\t2006-03-21 11:13:59.726139722 -0600\n" "+++ linux-2.6.16/drivers/pci/msi.c\t2006-03-21 11:14:06.210856320 -0600\n" "@@ -23,8 +23,6 @@\n" " #include \"pci.h\"\n" @@ -120,9 +121,11 @@ " \t{\n" "-\t\tint offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "-\t\t\tPCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;\n" - "+\t\tint offset_hi +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" + "+\t\tint offset_hi =\n" + "+\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "+\t\t\t\tPCI_MSIX_ENTRY_UPPER_ADDR_OFFSET;\n" - "+\t\tint offset_lo +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" + "+\t\tint offset_lo =\n" + "+\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "+\t\t\t\tPCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;\n" "+\n" "+\t\taddress_hi = readl(entry->mask_base + offset_hi);\n" @@ -271,7 +274,8 @@ " \t\t/* Configure MSI-X capability structure */\n" "-\t\tmsi_address_init(&address);\n" "-\t\tmsi_data_init(&data, vector);\n" - "-\t\tentry->msi_attrib.current_cpu -\t\t\t((address.lo_address.u.dest_id >>\n" + "-\t\tentry->msi_attrib.current_cpu =\n" + "-\t\t\t((address.lo_address.u.dest_id >>\n" "-\t\t\tMSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);\n" "-\t\twritel(address.lo_address.value,\n" "+\t\tstatus = msi_ops->setup(dev, vector,\n" @@ -303,7 +307,8 @@ " \tentry = msi_desc[vector];\n" " \tif (!entry || entry->dev != dev) {\n" "Index: linux-2.6.16/include/asm-i386/msi.h\n" - "=================================--- linux-2.6.16.orig/include/asm-i386/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-i386/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" "+++ linux-2.6.16/include/asm-i386/msi.h\t2006-03-21 11:14:06.213785721 -0600\n" "@@ -12,4 +12,12 @@\n" " #define LAST_DEVICE_VECTOR\t\t232\n" @@ -319,7 +324,8 @@ "+\n" " #endif /* ASM_MSI_H */\n" "Index: linux-2.6.16/include/asm-x86_64/msi.h\n" - "=================================--- linux-2.6.16.orig/include/asm-x86_64/msi.h\t2006-03-21 11:13:59.728092656 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-x86_64/msi.h\t2006-03-21 11:13:59.728092656 -0600\n" "+++ linux-2.6.16/include/asm-x86_64/msi.h\t2006-03-21 11:14:06.214762188 -0600\n" "@@ -13,4 +13,12 @@\n" " #define LAST_DEVICE_VECTOR\t\t232\n" @@ -335,7 +341,8 @@ "+\n" " #endif /* ASM_MSI_H */\n" "Index: linux-2.6.16/include/asm-ia64/machvec.h\n" - "=================================--- linux-2.6.16.orig/include/asm-ia64/machvec.h\t2006-03-21 11:13:59.728092656 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-ia64/machvec.h\t2006-03-21 11:13:59.728092656 -0600\n" "+++ linux-2.6.16/include/asm-ia64/machvec.h\t2006-03-21 11:14:57.089663570 -0600\n" "@@ -74,6 +74,7 @@\n" " typedef unsigned short ia64_mv_readw_relaxed_t (const volatile void __iomem *);\n" @@ -379,7 +386,8 @@ " \n" " #endif /* _ASM_IA64_MACHVEC_H */\n" "Index: linux-2.6.16/include/asm-ia64/machvec_sn2.h\n" - "=================================--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h\t2006-03-21 11:13:59.728092656 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-ia64/machvec_sn2.h\t2006-03-21 11:13:59.728092656 -0600\n" "+++ linux-2.6.16/include/asm-ia64/machvec_sn2.h\t2006-03-21 13:26:22.138073104 -0600\n" "@@ -66,6 +66,7 @@\n" " extern ia64_mv_dma_sync_sg_for_device\tsn_dma_sync_sg_for_device;\n" @@ -402,7 +410,8 @@ " #include <asm/sn/io.h>\n" " \n" "Index: linux-2.6.16/include/asm-ia64/msi.h\n" - "=================================--- linux-2.6.16.orig/include/asm-ia64/msi.h\t2006-03-21 11:13:59.729069123 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/include/asm-ia64/msi.h\t2006-03-21 11:13:59.729069123 -0600\n" "+++ linux-2.6.16/include/asm-ia64/msi.h\t2006-03-21 11:14:06.217691588 -0600\n" "@@ -14,4 +14,16 @@\n" " #define ack_APIC_irq\t\tia64_eoi\n" @@ -422,7 +431,8 @@ "+\n" " #endif /* ASM_MSI_H */\n" "Index: linux-2.6.16/drivers/pci/Makefile\n" - "=================================--- linux-2.6.16.orig/drivers/pci/Makefile\t2006-03-21 11:13:59.726139722 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/drivers/pci/Makefile\t2006-03-21 11:13:59.726139722 -0600\n" "+++ linux-2.6.16/drivers/pci/Makefile\t2006-03-21 11:14:06.217691588 -0600\n" "@@ -26,7 +26,11 @@\n" " obj-$(CONFIG_PPC64) += setup-bus.o\n" @@ -438,7 +448,8 @@ " #\n" " # ACPI Related PCI FW Functions\n" "Index: linux-2.6.16/drivers/pci/msi-apic.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.16/drivers/pci/msi-apic.c\t2006-03-21 11:14:06.220620989 -0600\n" "@@ -0,0 +1,100 @@\n" "+/*\n" @@ -542,7 +553,8 @@ "+\t.target = msi_target_apic,\n" "+};\n" "Index: linux-2.6.16/drivers/pci/msi.h\n" - "=================================--- linux-2.6.16.orig/drivers/pci/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" + "===================================================================\n" + "--- linux-2.6.16.orig/drivers/pci/msi.h\t2006-03-21 11:13:59.727116189 -0600\n" "+++ linux-2.6.16/drivers/pci/msi.h\t2006-03-21 11:14:06.223550390 -0600\n" "@@ -6,6 +6,68 @@\n" " #ifndef MSI_H\n" @@ -691,7 +703,8 @@ " \n" " \tstruct {\n" "Index: linux-2.6.16/drivers/pci/msi-altix.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.16/drivers/pci/msi-altix.c\t2006-03-21 11:14:06.229409191 -0600\n" "@@ -0,0 +1,18 @@\n" "+/*\n" @@ -713,4 +726,4 @@ "+\treturn -EINVAL;\n" +} -b2c0780e83e2412ab7d6f443f9a681abf46112f12f8110fb0f8eac825ebe4237 +45a92f949c084d0a8c91f4155a4abb45179f2a21ab0e4554eac854f6e412dfa8
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.