diff for duplicates of <42A83D7C.2010101@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 2c4dca4..8a1a6ad 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 2 files changed, 86 insertions(+) Index: linux-2.6.11.11/arch/ia64/lib/iomap_check.c -=================================--- linux-2.6.11.11.orig/arch/ia64/lib/iomap_check.c +=================================================================== +--- linux-2.6.11.11.orig/arch/ia64/lib/iomap_check.c +++ linux-2.6.11.11/arch/ia64/lib/iomap_check.c @@ -145,3 +145,4 @@ void clear_bridge_error(struct pci_dev * @@ -36,7 +37,8 @@ Index: linux-2.6.11.11/arch/ia64/lib/iomap_check.c EXPORT_SYMBOL(iochk_clear); +EXPORT_SYMBOL(iochk_devices); /* for MCA driver */ Index: linux-2.6.11.11/arch/ia64/kernel/mca_drv.c -=================================--- linux-2.6.11.11.orig/arch/ia64/kernel/mca_drv.c +=================================================================== +--- linux-2.6.11.11.orig/arch/ia64/kernel/mca_drv.c +++ linux-2.6.11.11/arch/ia64/kernel/mca_drv.c @@ -35,6 +35,13 @@ @@ -100,7 +102,7 @@ Index: linux-2.6.11.11/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 eb48806..d2234d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\042A8386F.2060100@jp.fujitsu.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" "Subject\0[PATCH 08/10] IOCHK interface for I/O error handling/detecting\0" - "Date\0Thu, 09 Jun 2005 13:00:44 +0000\0" + "Date\0Thu, 09 Jun 2005 22:00:44 +0900\0" "To\0Linux Kernel list <linux-kernel@vger.kernel.org>" " linux-ia64@vger.kernel.org\0" "Cc\0Linas Vepstas <linas@austin.ibm.com>" @@ -41,7 +41,8 @@ " 2 files changed, 86 insertions(+)\n" "\n" "Index: linux-2.6.11.11/arch/ia64/lib/iomap_check.c\n" - "=================================--- linux-2.6.11.11.orig/arch/ia64/lib/iomap_check.c\n" + "===================================================================\n" + "--- linux-2.6.11.11.orig/arch/ia64/lib/iomap_check.c\n" "+++ linux-2.6.11.11/arch/ia64/lib/iomap_check.c\n" "@@ -145,3 +145,4 @@ void clear_bridge_error(struct pci_dev *\n" "\n" @@ -49,7 +50,8 @@ " EXPORT_SYMBOL(iochk_clear);\n" "+EXPORT_SYMBOL(iochk_devices);\t/* for MCA driver */\n" "Index: linux-2.6.11.11/arch/ia64/kernel/mca_drv.c\n" - "=================================--- linux-2.6.11.11.orig/arch/ia64/kernel/mca_drv.c\n" + "===================================================================\n" + "--- linux-2.6.11.11.orig/arch/ia64/kernel/mca_drv.c\n" "+++ linux-2.6.11.11/arch/ia64/kernel/mca_drv.c\n" "@@ -35,6 +35,13 @@\n" "\n" @@ -113,7 +115,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" @@ -158,4 +160,4 @@ " \t * cpu read or memory-mapped io read\n" " \t *" -0c9055f6bd7c2b6600f93fd42a18cc0c2188b62f597a714f48bfaa9e003af210 +e8489eadd4d5522c2c2a25702ca86e3136a08fd94ac178908bd30f16da011336
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.