diff for duplicates of <42CB6961.2060508@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 3524b9d..56a2ab1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -56,7 +56,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 2 files changed, 112 insertions(+) Index: linux-2.6.13-rc1/include/asm-ia64/io.h -=================================--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h +=================================================================== +--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h +++ linux-2.6.13-rc1/include/asm-ia64/io.h @@ -189,6 +189,8 @@ __ia64_mk_io_addr (unsigned long port) * during optimization, which is why we use "volatile" pointers. @@ -200,7 +201,8 @@ Index: linux-2.6.13-rc1/include/asm-ia64/io.h __writeb (unsigned char val, volatile void __iomem *addr) { Index: linux-2.6.13-rc1/include/asm-ia64/gcc_intrin.h -=================================--- linux-2.6.13-rc1.orig/include/asm-ia64/gcc_intrin.h +=================================================================== +--- linux-2.6.13-rc1.orig/include/asm-ia64/gcc_intrin.h +++ linux-2.6.13-rc1/include/asm-ia64/gcc_intrin.h @@ -598,4 +598,20 @@ do { \ :: "r"((x)) : "p6", "p7", "memory"); \ @@ -213,7 +215,7 @@ Index: linux-2.6.13-rc1/include/asm-ia64/gcc_intrin.h + * Note that the read operation by itself does not consume + * the bad data, you have to do something with it, e.g.: + * -+ * ld.8 r9=[r10];; // r10 = I/O address ++ * ld.8 r9=[r10];; // r10 == I/O address + * add.8 r8=r9,0;; // fake operation + */ +#define ia64_mca_barrier(val) \ diff --git a/a/content_digest b/N1/content_digest index be4d840..65dbcfb 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 07/10] IOCHK interface for I/O error handling/detecting\0" - "Date\0Wed, 06 Jul 2005 05:17:21 +0000\0" + "Date\0Wed, 06 Jul 2005 14:17:21 +0900\0" "To\0Linux Kernel list <linux-kernel@vger.kernel.org>" linux-ia64@vger.kernel.org Luck @@ -71,7 +71,8 @@ " 2 files changed, 112 insertions(+)\n" "\n" "Index: linux-2.6.13-rc1/include/asm-ia64/io.h\n" - "=================================--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h\n" "+++ linux-2.6.13-rc1/include/asm-ia64/io.h\n" "@@ -189,6 +189,8 @@ __ia64_mk_io_addr (unsigned long port)\n" " * during optimization, which is why we use \"volatile\" pointers.\n" @@ -215,7 +216,8 @@ " __writeb (unsigned char val, volatile void __iomem *addr)\n" " {\n" "Index: linux-2.6.13-rc1/include/asm-ia64/gcc_intrin.h\n" - "=================================--- linux-2.6.13-rc1.orig/include/asm-ia64/gcc_intrin.h\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/include/asm-ia64/gcc_intrin.h\n" "+++ linux-2.6.13-rc1/include/asm-ia64/gcc_intrin.h\n" "@@ -598,4 +598,20 @@ do {\t\t\t\t\t\t\t\t\\\n" " \t\t :: \"r\"((x)) : \"p6\", \"p7\", \"memory\");\t\\\n" @@ -228,7 +230,7 @@ "+ * Note that the read operation by itself does not consume\n" "+ * the bad data, you have to do something with it, e.g.:\n" "+ *\n" - "+ *\tld.8\tr9=[r10];;\t// r10 = I/O address\n" + "+ *\tld.8\tr9=[r10];;\t// r10 == I/O address\n" "+ *\tadd.8\tr8=r9,0;;\t// fake operation\n" "+ */\n" "+#define ia64_mca_barrier(val)\t\t\t\t\t\\\n" @@ -239,4 +241,4 @@ "+\n" #endif /* _ASM_IA64_GCC_INTRIN_H */ -d451dc0bb689c2d89de48a44239cff4d5082564ef3c05528eb400e4d903b9d2e +56568c48bb31a9c581f5e82de9ed9c5c959285e4ef9f2ca4320c17ffab0dee4b
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.