diff for duplicates of <4423A4B4.4080408@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index a54aee6..67dcf7f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 2 files changed, 82 insertions(+) Index: linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c -=================================--- linux-2.6.16_WORK.orig/arch/ia64/kernel/mca_drv.c +=================================================================== +--- linux-2.6.16_WORK.orig/arch/ia64/kernel/mca_drv.c +++ linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c @@ -37,6 +37,11 @@ @@ -52,7 +53,7 @@ Index: linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c + +#define isMEM64(resource) \ +(((resource).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)) + +/** + * pcierr_recovery - Check if MCA occur on transaction in pcierr_list. @@ -80,7 +81,7 @@ Index: linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c + if (loop++ > 1024 || !cookie) + break; + /* double check */ -+ if (pcierr_list.next = cookie->list.next) ++ if (pcierr_list.next == cookie->list.next) + break; + tdev = cookie->dev; + if (!tdev) @@ -118,7 +119,8 @@ Index: linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c } Index: linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c -=================================--- linux-2.6.16_WORK.orig/arch/ia64/lib/pcierr_check.c +=================================================================== +--- linux-2.6.16_WORK.orig/arch/ia64/lib/pcierr_check.c +++ linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c @@ -68,5 +68,6 @@ return 0; diff --git a/a/content_digest b/N1/content_digest index 8d8ceaf..4f93b92 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\044210D1B.7010806@jp.fujitsu.com\0" "ref\020060322210157.GH12335@kroah.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" - "Subject\0[PATCH 4/6] PCIERR : interfaces for synchronous I/O error detection\0" - "Date\0Fri, 24 Mar 2006 07:50:12 +0000\0" + "Subject\0[PATCH 4/6] PCIERR : interfaces for synchronous I/O error detection on driver (mcadrv)\0" + "Date\0Fri, 24 Mar 2006 16:50:12 +0900\0" "To\0Greg KH <greg@kroah.com>\0" "Cc\0Linux Kernel list <linux-kernel@vger.kernel.org>" linux-ia64@vger.kernel.org @@ -24,7 +24,8 @@ " 2 files changed, 82 insertions(+)\n" "\n" "Index: linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c\n" - "=================================--- linux-2.6.16_WORK.orig/arch/ia64/kernel/mca_drv.c\n" + "===================================================================\n" + "--- linux-2.6.16_WORK.orig/arch/ia64/kernel/mca_drv.c\n" "+++ linux-2.6.16_WORK/arch/ia64/kernel/mca_drv.c\n" "@@ -37,6 +37,11 @@\n" "\n" @@ -63,7 +64,7 @@ "+\n" "+#define isMEM64(resource) \\\n" "+(((resource).flags & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK)) \\\n" - "+\t= (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64))\n" + "+\t== (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64))\n" "+\n" "+/**\n" "+ * pcierr_recovery - Check if MCA occur on transaction in pcierr_list.\n" @@ -91,7 +92,7 @@ "+\t\tif (loop++ > 1024 || !cookie)\n" "+\t\t\tbreak;\n" "+\t\t/* double check */\n" - "+\t\tif (pcierr_list.next = cookie->list.next)\n" + "+\t\tif (pcierr_list.next == cookie->list.next)\n" "+\t\t\tbreak;\n" "+\t\ttdev = cookie->dev;\n" "+\t\tif (!tdev)\n" @@ -129,7 +130,8 @@ " }\n" "\n" "Index: linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c\n" - "=================================--- linux-2.6.16_WORK.orig/arch/ia64/lib/pcierr_check.c\n" + "===================================================================\n" + "--- linux-2.6.16_WORK.orig/arch/ia64/lib/pcierr_check.c\n" "+++ linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c\n" "@@ -68,5 +68,6 @@\n" " \treturn 0;\n" @@ -139,4 +141,4 @@ " EXPORT_SYMBOL(pcierr_read);\n" EXPORT_SYMBOL(pcierr_clear); -375df8bff9a5fcde1e02940cd8b4189c1d0356699dd9b8d7fb968852c19de6cc +c0544d7c0d27efa44aebefd4c9ce7aa61d30c4bbda624b74673cfc537f5c1e64
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.