diff for duplicates of <43182A3F.2020106@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 9caefcf..9174a11 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 7 files changed, 409 insertions(+) Index: linux-2.6.13/arch/ia64/lib/Makefile -=================================--- linux-2.6.13.orig/arch/ia64/lib/Makefile +=================================================================== +--- linux-2.6.13.orig/arch/ia64/lib/Makefile +++ linux-2.6.13/arch/ia64/lib/Makefile @@ -16,6 +16,7 @@ lib-$(CONFIG_MCKINLEY) += copy_page_mck. lib-$(CONFIG_PERFMON) += carta_random.o @@ -41,9 +42,11 @@ Index: linux-2.6.13/arch/ia64/lib/Makefile lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o +lib-$(CONFIG_IOMAP_CHECK) += iomap_check.o - AFLAGS___divdi3.o AFLAGS___udivdi3.o = -DUNSIGNED + AFLAGS___divdi3.o = + AFLAGS___udivdi3.o = -DUNSIGNED Index: linux-2.6.13/arch/ia64/Kconfig -=================================--- linux-2.6.13.orig/arch/ia64/Kconfig +=================================================================== +--- linux-2.6.13.orig/arch/ia64/Kconfig +++ linux-2.6.13/arch/ia64/Kconfig @@ -399,6 +399,19 @@ config PCI_DOMAINS bool @@ -66,7 +69,8 @@ Index: linux-2.6.13/arch/ia64/Kconfig source "drivers/pci/hotplug/Kconfig" Index: linux-2.6.13/arch/ia64/lib/iomap_check.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ linux-2.6.13/arch/ia64/lib/iomap_check.c @@ -0,0 +1,150 @@ +/* @@ -190,7 +194,7 @@ Index: linux-2.6.13/arch/ia64/lib/iomap_check.c + } else { + /* local notify, ex. Parity, Abort etc. */ + list_for_each_entry(cookie, &iochk_devices, list) { -+ if (cookie->host = bridge) ++ if (cookie->host == bridge) + cookie->error = 1; + } + } @@ -220,7 +224,8 @@ Index: linux-2.6.13/arch/ia64/lib/iomap_check.c +EXPORT_SYMBOL(iochk_clear); +EXPORT_SYMBOL(iochk_devices); /* for MCA driver */ Index: linux-2.6.13/include/asm-ia64/io.h -=================================--- linux-2.6.13.orig/include/asm-ia64/io.h +=================================================================== +--- linux-2.6.13.orig/include/asm-ia64/io.h +++ linux-2.6.13/include/asm-ia64/io.h @@ -70,6 +70,23 @@ extern unsigned int num_io_spaces; #include <asm/machvec.h> @@ -390,7 +395,8 @@ Index: linux-2.6.13/include/asm-ia64/io.h __writeb (unsigned char val, volatile void __iomem *addr) { Index: linux-2.6.13/arch/ia64/kernel/mca.c -=================================--- linux-2.6.13.orig/arch/ia64/kernel/mca.c +=================================================================== +--- linux-2.6.13.orig/arch/ia64/kernel/mca.c +++ linux-2.6.13/arch/ia64/kernel/mca.c @@ -77,6 +77,11 @@ #include <asm/irq.h> @@ -420,7 +426,8 @@ Index: linux-2.6.13/arch/ia64/kernel/mca.c /* * Wakeup all the processors which are spinning in the rendezvous Index: linux-2.6.13/arch/ia64/kernel/mca_asm.S -=================================--- linux-2.6.13.orig/arch/ia64/kernel/mca_asm.S +=================================================================== +--- linux-2.6.13.orig/arch/ia64/kernel/mca_asm.S +++ linux-2.6.13/arch/ia64/kernel/mca_asm.S @@ -16,6 +16,9 @@ // 04/11/12 Russ Anderson <rja@sgi.com> @@ -466,7 +473,8 @@ Index: linux-2.6.13/arch/ia64/kernel/mca_asm.S + +#endif Index: linux-2.6.13/arch/ia64/kernel/mca_drv.c -=================================--- linux-2.6.13.orig/arch/ia64/kernel/mca_drv.c +=================================================================== +--- linux-2.6.13.orig/arch/ia64/kernel/mca_drv.c +++ linux-2.6.13/arch/ia64/kernel/mca_drv.c @@ -35,6 +35,12 @@ @@ -528,7 +536,7 @@ Index: linux-2.6.13/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 a56b4d2..ca6bd72 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0431694DB.90400@jp.fujitsu.com\0" "ref\020050901172917.I10072@chenjesu.americas.sgi.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" - "Subject\0Re: [PATCH 2.6.13 1/2] IOCHK interface for I/O error handling/detecting\0" - "Date\0Fri, 02 Sep 2005 10:32:31 +0000\0" + "Subject\0Re: [PATCH 2.6.13 1/2] IOCHK interface for I/O error handling/detecting (for ia64)\0" + "Date\0Fri, 02 Sep 2005 19:32:31 +0900\0" "To\0linux-ia64@vger.kernel.org\0" "Cc\0Brent Casavant <bcasavan@sgi.com>" " Linux Kernel list <linux-kernel@vger.kernel.org>\0" @@ -43,7 +43,8 @@ " 7 files changed, 409 insertions(+)\n" "\n" "Index: linux-2.6.13/arch/ia64/lib/Makefile\n" - "=================================--- linux-2.6.13.orig/arch/ia64/lib/Makefile\n" + "===================================================================\n" + "--- linux-2.6.13.orig/arch/ia64/lib/Makefile\n" "+++ linux-2.6.13/arch/ia64/lib/Makefile\n" "@@ -16,6 +16,7 @@ lib-$(CONFIG_MCKINLEY)\t+= copy_page_mck.\n" " lib-$(CONFIG_PERFMON)\t+= carta_random.o\n" @@ -51,9 +52,11 @@ " lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o\n" "+lib-$(CONFIG_IOMAP_CHECK) += iomap_check.o\n" "\n" - " AFLAGS___divdi3.o\t AFLAGS___udivdi3.o\t= -DUNSIGNED\n" + " AFLAGS___divdi3.o\t=\n" + " AFLAGS___udivdi3.o\t= -DUNSIGNED\n" "Index: linux-2.6.13/arch/ia64/Kconfig\n" - "=================================--- linux-2.6.13.orig/arch/ia64/Kconfig\n" + "===================================================================\n" + "--- linux-2.6.13.orig/arch/ia64/Kconfig\n" "+++ linux-2.6.13/arch/ia64/Kconfig\n" "@@ -399,6 +399,19 @@ config PCI_DOMAINS\n" " \tbool\n" @@ -76,7 +79,8 @@ "\n" " source \"drivers/pci/hotplug/Kconfig\"\n" "Index: linux-2.6.13/arch/ia64/lib/iomap_check.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ linux-2.6.13/arch/ia64/lib/iomap_check.c\n" "@@ -0,0 +1,150 @@\n" "+/*\n" @@ -200,7 +204,7 @@ "+\t} else {\n" "+\t\t/* local notify, ex. Parity, Abort etc. */\n" "+\t\tlist_for_each_entry(cookie, &iochk_devices, list) {\n" - "+\t\t\tif (cookie->host = bridge)\n" + "+\t\t\tif (cookie->host == bridge)\n" "+\t\t\t\tcookie->error = 1;\n" "+\t\t}\n" "+\t}\n" @@ -230,7 +234,8 @@ "+EXPORT_SYMBOL(iochk_clear);\n" "+EXPORT_SYMBOL(iochk_devices);\t/* for MCA driver */\n" "Index: linux-2.6.13/include/asm-ia64/io.h\n" - "=================================--- linux-2.6.13.orig/include/asm-ia64/io.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-ia64/io.h\n" "+++ linux-2.6.13/include/asm-ia64/io.h\n" "@@ -70,6 +70,23 @@ extern unsigned int num_io_spaces;\n" " #include <asm/machvec.h>\n" @@ -400,7 +405,8 @@ " __writeb (unsigned char val, volatile void __iomem *addr)\n" " {\n" "Index: linux-2.6.13/arch/ia64/kernel/mca.c\n" - "=================================--- linux-2.6.13.orig/arch/ia64/kernel/mca.c\n" + "===================================================================\n" + "--- linux-2.6.13.orig/arch/ia64/kernel/mca.c\n" "+++ linux-2.6.13/arch/ia64/kernel/mca.c\n" "@@ -77,6 +77,11 @@\n" " #include <asm/irq.h>\n" @@ -430,7 +436,8 @@ " \t/*\n" " \t * Wakeup all the processors which are spinning in the rendezvous\n" "Index: linux-2.6.13/arch/ia64/kernel/mca_asm.S\n" - "=================================--- linux-2.6.13.orig/arch/ia64/kernel/mca_asm.S\n" + "===================================================================\n" + "--- linux-2.6.13.orig/arch/ia64/kernel/mca_asm.S\n" "+++ linux-2.6.13/arch/ia64/kernel/mca_asm.S\n" "@@ -16,6 +16,9 @@\n" " // 04/11/12 Russ Anderson <rja@sgi.com>\n" @@ -476,7 +483,8 @@ "+\n" "+#endif\n" "Index: linux-2.6.13/arch/ia64/kernel/mca_drv.c\n" - "=================================--- linux-2.6.13.orig/arch/ia64/kernel/mca_drv.c\n" + "===================================================================\n" + "--- linux-2.6.13.orig/arch/ia64/kernel/mca_drv.c\n" "+++ linux-2.6.13/arch/ia64/kernel/mca_drv.c\n" "@@ -35,6 +35,12 @@\n" "\n" @@ -538,7 +546,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" @@ -584,4 +592,4 @@ " \treturn 0;\n" } -0c05f520069eb425df7be2ab38cdffcdc6dbd2aba15c5ead416c3a7af1b4450f +47cd8fc5a770a5a0637580a8f254ee815f0c954256414759c60bdbb425d7e4fe
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.