diff for duplicates of <42CB69BD.1090607@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 5cecc40..c2dcdac 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 2 files changed, 85 insertions(+) Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c -=================================--- linux-2.6.13-rc1.orig/arch/ia64/lib/iomap_check.c +=================================================================== +--- linux-2.6.13-rc1.orig/arch/ia64/lib/iomap_check.c +++ linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c @@ -147,3 +147,4 @@ void clear_bridge_error(struct pci_dev * @@ -39,7 +40,8 @@ Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c EXPORT_SYMBOL(iochk_clear); +EXPORT_SYMBOL(iochk_devices); /* for MCA driver */ Index: linux-2.6.13-rc1/arch/ia64/kernel/mca_drv.c -=================================--- linux-2.6.13-rc1.orig/arch/ia64/kernel/mca_drv.c +=================================================================== +--- linux-2.6.13-rc1.orig/arch/ia64/kernel/mca_drv.c +++ linux-2.6.13-rc1/arch/ia64/kernel/mca_drv.c @@ -35,6 +35,12 @@ @@ -101,7 +103,7 @@ Index: linux-2.6.13-rc1/arch/ia64/kernel/mca_drv.c + return 1; + if ((tdev->resource[i].flags + & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK)) -+ = (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64)) ++ == (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64)) + i++; + } + } diff --git a/a/content_digest b/N1/content_digest index f9e9813..5574d8c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\042CB63B2.6000505@jp.fujitsu.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" "Subject\0[PATCH 2.6.13-rc1 08/10] IOCHK interface for I/O error handling/detecting\0" - "Date\0Wed, 06 Jul 2005 05:18:53 +0000\0" + "Date\0Wed, 06 Jul 2005 14:18:53 +0900\0" "To\0Linux Kernel list <linux-kernel@vger.kernel.org>" linux-ia64@vger.kernel.org Luck @@ -46,7 +46,8 @@ " 2 files changed, 85 insertions(+)\n" "\n" "Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c\n" - "=================================--- linux-2.6.13-rc1.orig/arch/ia64/lib/iomap_check.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/arch/ia64/lib/iomap_check.c\n" "+++ linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c\n" "@@ -147,3 +147,4 @@ void clear_bridge_error(struct pci_dev *\n" "\n" @@ -54,7 +55,8 @@ " EXPORT_SYMBOL(iochk_clear);\n" "+EXPORT_SYMBOL(iochk_devices);\t/* for MCA driver */\n" "Index: linux-2.6.13-rc1/arch/ia64/kernel/mca_drv.c\n" - "=================================--- linux-2.6.13-rc1.orig/arch/ia64/kernel/mca_drv.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/arch/ia64/kernel/mca_drv.c\n" "+++ linux-2.6.13-rc1/arch/ia64/kernel/mca_drv.c\n" "@@ -35,6 +35,12 @@\n" "\n" @@ -116,7 +118,7 @@ "+\t\t\treturn 1;\n" "+\t\t if ((tdev->resource[i].flags\n" "+\t\t & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK))\n" - "+\t\t = (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64))\n" + "+\t\t == (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64))\n" "+\t\t\ti++;\n" "+\t\t}\n" "+\t}\n" @@ -162,4 +164,4 @@ " \t * cpu read or memory-mapped io read\n" " \t *" -3cc232e6a4caa6bcfb579634bc6ea8449340a865b6709edbe223ba07ba4185f1 +1fa5b8b81edee660e29a8b337a6996257f85c3b49e01ddcd521724498dea5966
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.