diff for duplicates of <20080428192457.GC14629@sgi.com> diff --git a/a/1.txt b/N1/1.txt index b3b2d5c..86b13f1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,8 @@ Signed-off-by: Russ Anderson <rja@sgi.com> 7 files changed, 319 insertions(+), 1 deletion(-) Index: test/arch/ia64/kernel/Makefile -=================================--- test.orig/arch/ia64/kernel/Makefile 2008-04-28 13:27:48.682600987 -0500 +=================================================================== +--- test.orig/arch/ia64/kernel/Makefile 2008-04-28 13:27:48.682600987 -0500 +++ test/arch/ia64/kernel/Makefile 2008-04-28 13:27:56.511575718 -0500 @@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON) += perfmon_defaul obj-$(CONFIG_IA64_CYCLONE) += cyclone.o @@ -30,7 +31,8 @@ Index: test/arch/ia64/kernel/Makefile obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o Index: test/arch/ia64/kernel/cpe_migrate.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ test/arch/ia64/kernel/cpe_migrate.c 2008-04-28 13:27:56.523577213 -0500 @@ -0,0 +1,275 @@ +/* @@ -108,7 +110,7 @@ Index: test/arch/ia64/kernel/cpe_migrate.c + plat_err = (sal_log_platform_err_info_t *)&err_rec->proc_err; + + guid = (efi_guid_t)plat_err->mem_dev_err.header.guid; -+ if (efi_guidcmp(guid, SAL_PLAT_MEM_DEV_ERR_SECT_GUID) = 0) { ++ if (efi_guidcmp(guid, SAL_PLAT_MEM_DEV_ERR_SECT_GUID) == 0) { + /* + * Memory cpe + */ @@ -177,7 +179,7 @@ Index: test/arch/ia64/kernel/cpe_migrate.c + + SetPageMemError(page); /* Mark the page as bad */ + ret = migrate_pages(&pagelist, alloc_migrate_page, node); -+ if (ret = 0) ++ if (ret == 0) + list_add_tail(&page->lru, &badpagelist); + + spin_unlock_irqrestore(&cpe_migrate_lock, irq_flags); @@ -252,15 +254,15 @@ Index: test/arch/ia64/kernel/cpe_migrate.c + if (!paddr) + return -1; + -+ if (!((cpe_head = cpe_tail) && (cpe_paddr[cpe_head] = 0))) ++ if (!((cpe_head == cpe_tail) && (cpe_paddr[cpe_head] == 0))) + /* + * List not empty + */ + for (i = 0; i < CE_HISTORY_LENGTH; i++) -+ if ((PAGE_ALIGN(cpe_paddr[i])) = PAGE_ALIGN(paddr)) ++ if ((PAGE_ALIGN(cpe_paddr[i])) == PAGE_ALIGN(paddr)) + return 1; /* already on the list */ + -+ if (cpe_paddr[cpe_head] = 0) { ++ if (cpe_paddr[cpe_head] == 0) { + cpe_paddr[cpe_head] = paddr; + cpe_node[cpe_head] = node; + @@ -277,7 +279,8 @@ Index: test/arch/ia64/kernel/cpe_migrate.c +} + +/* -+ * ======================================+ */ ++ * ============================================================================= ++ */ + +int __init cpe_migrate_external_handler_init(void) +{ @@ -308,7 +311,8 @@ Index: test/arch/ia64/kernel/cpe_migrate.c +MODULE_DESCRIPTION("ia64 Corrected Error page migration driver"); +MODULE_LICENSE("GPL"); Index: test/arch/ia64/kernel/mca.c -=================================--- test.orig/arch/ia64/kernel/mca.c 2008-04-28 13:27:48.682600987 -0500 +=================================================================== +--- test.orig/arch/ia64/kernel/mca.c 2008-04-28 13:27:48.682600987 -0500 +++ test/arch/ia64/kernel/mca.c 2008-04-28 13:27:56.543579703 -0500 @@ -68,6 +68,9 @@ * @@ -380,7 +384,8 @@ Index: test/arch/ia64/kernel/mca.c return IRQ_HANDLED; } Index: test/arch/ia64/Kconfig -=================================--- test.orig/arch/ia64/Kconfig 2008-04-28 13:27:48.682600987 -0500 +=================================================================== +--- test.orig/arch/ia64/Kconfig 2008-04-28 13:27:48.682600987 -0500 +++ test/arch/ia64/Kconfig 2008-04-28 13:27:56.575583688 -0500 @@ -451,6 +451,9 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY @@ -393,7 +398,8 @@ Index: test/arch/ia64/Kconfig bool "Performance monitor support" help Index: test/include/asm-ia64/mca.h -=================================--- test.orig/include/asm-ia64/mca.h 2008-04-28 13:27:48.682600987 -0500 +=================================================================== +--- test.orig/include/asm-ia64/mca.h 2008-04-28 13:27:48.682600987 -0500 +++ test/include/asm-ia64/mca.h 2008-04-28 13:27:56.591585680 -0500 @@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP @@ -413,7 +419,8 @@ Index: test/include/asm-ia64/mca.h extern void ia64_mca_printk(const char * fmt, ...) __attribute__ ((format (printf, 1, 2))); Index: test/mm/migrate.c -=================================--- test.orig/mm/migrate.c 2008-04-28 13:27:48.686601486 -0500 +=================================================================== +--- test.orig/mm/migrate.c 2008-04-28 13:27:48.686601486 -0500 +++ test/mm/migrate.c 2008-04-28 13:27:56.615588668 -0500 @@ -64,6 +64,7 @@ int isolate_lru_page(struct page *page, } @@ -440,7 +447,8 @@ Index: test/mm/migrate.c #ifdef CONFIG_NUMA /* Index: test/include/asm-ia64/page.h -=================================--- test.orig/include/asm-ia64/page.h 2008-04-28 13:27:48.682600987 -0500 +=================================================================== +--- test.orig/include/asm-ia64/page.h 2008-04-28 13:27:48.682600987 -0500 +++ test/include/asm-ia64/page.h 2008-04-28 13:27:56.639591657 -0500 @@ -125,6 +125,7 @@ extern unsigned long max_low_pfn; #endif diff --git a/a/content_digest b/N1/content_digest index 15d671b..0112cf7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Russ Anderson <rja@sgi.com>\0" "Subject\0[PATCH 2/2] ia64: Call migration code on correctable errors\0" - "Date\0Mon, 28 Apr 2008 19:24:57 +0000\0" + "Date\0Mon, 28 Apr 2008 14:24:57 -0500\0" "To\0linux-kernel@vger.kernel.org" " linux-ia64@vger.kernel.org\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" @@ -31,7 +31,8 @@ " 7 files changed, 319 insertions(+), 1 deletion(-)\n" "\n" "Index: test/arch/ia64/kernel/Makefile\n" - "=================================--- test.orig/arch/ia64/kernel/Makefile\t2008-04-28 13:27:48.682600987 -0500\n" + "===================================================================\n" + "--- test.orig/arch/ia64/kernel/Makefile\t2008-04-28 13:27:48.682600987 -0500\n" "+++ test/arch/ia64/kernel/Makefile\t2008-04-28 13:27:56.511575718 -0500\n" "@@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON)\t\t+= perfmon_defaul\n" " obj-$(CONFIG_IA64_CYCLONE)\t+= cyclone.o\n" @@ -42,7 +43,8 @@ " obj-$(CONFIG_KEXEC)\t\t+= machine_kexec.o relocate_kernel.o crash.o\n" " obj-$(CONFIG_CRASH_DUMP)\t+= crash_dump.o\n" "Index: test/arch/ia64/kernel/cpe_migrate.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ test/arch/ia64/kernel/cpe_migrate.c\t2008-04-28 13:27:56.523577213 -0500\n" "@@ -0,0 +1,275 @@\n" "+/*\n" @@ -120,7 +122,7 @@ "+\tplat_err = (sal_log_platform_err_info_t *)&err_rec->proc_err;\n" "+\n" "+\tguid = (efi_guid_t)plat_err->mem_dev_err.header.guid;\n" - "+\tif (efi_guidcmp(guid, SAL_PLAT_MEM_DEV_ERR_SECT_GUID) = 0) {\n" + "+\tif (efi_guidcmp(guid, SAL_PLAT_MEM_DEV_ERR_SECT_GUID) == 0) {\n" "+\t\t/*\n" "+\t\t * Memory cpe\n" "+\t\t */\n" @@ -189,7 +191,7 @@ "+\n" "+\tSetPageMemError(page);\t\t/* Mark the page as bad */\n" "+\tret = migrate_pages(&pagelist, alloc_migrate_page, node);\n" - "+\tif (ret = 0)\n" + "+\tif (ret == 0)\n" "+\t\tlist_add_tail(&page->lru, &badpagelist);\n" "+\n" "+\tspin_unlock_irqrestore(&cpe_migrate_lock, irq_flags);\n" @@ -264,15 +266,15 @@ "+\tif (!paddr)\n" "+\t\treturn -1;\n" "+\n" - "+\tif (!((cpe_head = cpe_tail) && (cpe_paddr[cpe_head] = 0)))\n" + "+\tif (!((cpe_head == cpe_tail) && (cpe_paddr[cpe_head] == 0)))\n" "+\t\t/*\n" "+\t\t * List not empty\n" "+\t\t */\n" "+\t\tfor (i = 0; i < CE_HISTORY_LENGTH; i++)\n" - "+\t\t\tif ((PAGE_ALIGN(cpe_paddr[i])) = PAGE_ALIGN(paddr))\n" + "+\t\t\tif ((PAGE_ALIGN(cpe_paddr[i])) == PAGE_ALIGN(paddr))\n" "+\t\t\t\treturn 1;\t/* already on the list */\n" "+\n" - "+\tif (cpe_paddr[cpe_head] = 0) {\n" + "+\tif (cpe_paddr[cpe_head] == 0) {\n" "+\t\tcpe_paddr[cpe_head] = paddr;\n" "+\t\tcpe_node[cpe_head] = node;\n" "+\n" @@ -289,7 +291,8 @@ "+}\n" "+\n" "+/*\n" - "+ * ======================================+ */\n" + "+ * =============================================================================\n" + "+ */\n" "+\n" "+int __init cpe_migrate_external_handler_init(void)\n" "+{\n" @@ -320,7 +323,8 @@ "+MODULE_DESCRIPTION(\"ia64 Corrected Error page migration driver\");\n" "+MODULE_LICENSE(\"GPL\");\n" "Index: test/arch/ia64/kernel/mca.c\n" - "=================================--- test.orig/arch/ia64/kernel/mca.c\t2008-04-28 13:27:48.682600987 -0500\n" + "===================================================================\n" + "--- test.orig/arch/ia64/kernel/mca.c\t2008-04-28 13:27:48.682600987 -0500\n" "+++ test/arch/ia64/kernel/mca.c\t2008-04-28 13:27:56.543579703 -0500\n" "@@ -68,6 +68,9 @@\n" " *\n" @@ -392,7 +396,8 @@ " \treturn IRQ_HANDLED;\n" " }\n" "Index: test/arch/ia64/Kconfig\n" - "=================================--- test.orig/arch/ia64/Kconfig\t2008-04-28 13:27:48.682600987 -0500\n" + "===================================================================\n" + "--- test.orig/arch/ia64/Kconfig\t2008-04-28 13:27:48.682600987 -0500\n" "+++ test/arch/ia64/Kconfig\t2008-04-28 13:27:56.575583688 -0500\n" "@@ -451,6 +451,9 @@ config COMPAT_FOR_U64_ALIGNMENT\n" " config IA64_MCA_RECOVERY\n" @@ -405,7 +410,8 @@ " \tbool \"Performance monitor support\"\n" " \thelp\n" "Index: test/include/asm-ia64/mca.h\n" - "=================================--- test.orig/include/asm-ia64/mca.h\t2008-04-28 13:27:48.682600987 -0500\n" + "===================================================================\n" + "--- test.orig/include/asm-ia64/mca.h\t2008-04-28 13:27:48.682600987 -0500\n" "+++ test/include/asm-ia64/mca.h\t2008-04-28 13:27:56.591585680 -0500\n" "@@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP\n" " \n" @@ -425,7 +431,8 @@ " extern void ia64_mca_printk(const char * fmt, ...)\n" " \t __attribute__ ((format (printf, 1, 2)));\n" "Index: test/mm/migrate.c\n" - "=================================--- test.orig/mm/migrate.c\t2008-04-28 13:27:48.686601486 -0500\n" + "===================================================================\n" + "--- test.orig/mm/migrate.c\t2008-04-28 13:27:48.686601486 -0500\n" "+++ test/mm/migrate.c\t2008-04-28 13:27:56.615588668 -0500\n" "@@ -64,6 +64,7 @@ int isolate_lru_page(struct page *page, \n" " \t}\n" @@ -452,7 +459,8 @@ " #ifdef CONFIG_NUMA\n" " /*\n" "Index: test/include/asm-ia64/page.h\n" - "=================================--- test.orig/include/asm-ia64/page.h\t2008-04-28 13:27:48.682600987 -0500\n" + "===================================================================\n" + "--- test.orig/include/asm-ia64/page.h\t2008-04-28 13:27:48.682600987 -0500\n" "+++ test/include/asm-ia64/page.h\t2008-04-28 13:27:56.639591657 -0500\n" "@@ -125,6 +125,7 @@ extern unsigned long max_low_pfn;\n" " #endif\n" @@ -466,4 +474,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -023b87367f191d4ce5913d198871b5367179351c2c6b5ad8fecec7a582429c33 +96c8bc0ce9f9cbdc28123f0ce9900b667d58ac5912cfd533c7b4004a70b2ddff
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.