diff for duplicates of <20080513230509.GD26722@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 8a59d5b..2f7ce8b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,8 @@ Signed-off-by: Russ Anderson <rja@sgi.com> 7 files changed, 472 insertions(+), 1 deletion(-) Index: linus/arch/ia64/kernel/Makefile -=================================--- linus.orig/arch/ia64/kernel/Makefile 2008-05-13 16:45:50.039583104 -0500 +=================================================================== +--- linus.orig/arch/ia64/kernel/Makefile 2008-05-13 16:45:50.039583104 -0500 +++ linus/arch/ia64/kernel/Makefile 2008-05-13 16:47:50.190357060 -0500 @@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON) += perfmon_defaul obj-$(CONFIG_IA64_CYCLONE) += cyclone.o @@ -29,7 +30,8 @@ Index: linus/arch/ia64/kernel/Makefile obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o Index: linus/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 +++ linus/arch/ia64/kernel/cpe_migrate.c 2008-05-13 17:44:33.657066460 -0500 @@ -0,0 +1,418 @@ +/* @@ -101,7 +103,7 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c + plat_err = (sal_log_platform_err_info_t *)&err_rec->proc_err; + + guid = 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 + */ @@ -173,7 +175,7 @@ Index: linus/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); + else + /* @@ -260,7 +262,7 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c + * List not empty + */ + for (i = 0; i < CE_HISTORY_LENGTH; i++) { -+ if (PAGE_ALIGN(cpe[i].paddr) = PAGE_ALIGN(paddr)) ++ if (PAGE_ALIGN(cpe[i].paddr) == PAGE_ALIGN(paddr)) + return 1; /* already on the list */ + } + @@ -272,7 +274,7 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c + return 1; + } + -+ if (cpe[cpe_head].paddr = 0) { ++ if (cpe[cpe_head].paddr == 0) { + cpe[cpe_head].node = node; + cpe[cpe_head].paddr = paddr; + @@ -290,7 +292,8 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c +} + +/* -+ * ======================================+ */ ++ * ============================================================================= ++ */ + +/* + * free_one_bad_page @@ -356,7 +359,7 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c + if (err) + return err; + -+ if (opt = 0) ++ if (opt == 0) + free_all_bad_pages(); + else + free_one_bad_page(opt); @@ -450,7 +453,8 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c +MODULE_DESCRIPTION("ia64 Corrected Error page migration driver"); +MODULE_LICENSE("GPL"); Index: linus/arch/ia64/kernel/mca.c -=================================--- linus.orig/arch/ia64/kernel/mca.c 2008-05-13 16:45:50.039583104 -0500 +=================================================================== +--- linus.orig/arch/ia64/kernel/mca.c 2008-05-13 16:45:50.039583104 -0500 +++ linus/arch/ia64/kernel/mca.c 2008-05-13 16:47:50.234362472 -0500 @@ -68,6 +68,9 @@ * @@ -522,7 +526,8 @@ Index: linus/arch/ia64/kernel/mca.c return IRQ_HANDLED; } Index: linus/arch/ia64/Kconfig -=================================--- linus.orig/arch/ia64/Kconfig 2008-05-13 16:45:50.039583104 -0500 +=================================================================== +--- linus.orig/arch/ia64/Kconfig 2008-05-13 16:45:50.039583104 -0500 +++ linus/arch/ia64/Kconfig 2008-05-13 17:16:14.077805136 -0500 @@ -456,6 +456,15 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY @@ -541,7 +546,8 @@ Index: linus/arch/ia64/Kconfig bool "Performance monitor support" help Index: linus/include/asm-ia64/mca.h -=================================--- linus.orig/include/asm-ia64/mca.h 2008-05-13 16:45:50.039583104 -0500 +=================================================================== +--- linus.orig/include/asm-ia64/mca.h 2008-05-13 16:45:50.039583104 -0500 +++ linus/include/asm-ia64/mca.h 2008-05-13 17:26:41.519806327 -0500 @@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP @@ -566,7 +572,8 @@ Index: linus/include/asm-ia64/mca.h struct ia64_mca_notify_die { struct ia64_sal_os_state *sos; Index: linus/mm/migrate.c -=================================--- linus.orig/mm/migrate.c 2008-05-13 16:45:50.039583104 -0500 +=================================================================== +--- linus.orig/mm/migrate.c 2008-05-13 16:45:50.039583104 -0500 +++ linus/mm/migrate.c 2008-05-13 16:47:50.322373295 -0500 @@ -36,6 +36,7 @@ #define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru)) @@ -609,7 +616,8 @@ Index: linus/mm/migrate.c #ifdef CONFIG_NUMA /* Index: linus/include/asm-ia64/page.h -=================================--- linus.orig/include/asm-ia64/page.h 2008-05-13 16:45:50.039583104 -0500 +=================================================================== +--- linus.orig/include/asm-ia64/page.h 2008-05-13 16:45:50.039583104 -0500 +++ linus/include/asm-ia64/page.h 2008-05-13 16:47:50.354377231 -0500 @@ -122,6 +122,7 @@ extern unsigned long max_low_pfn; #endif diff --git a/a/content_digest b/N1/content_digest index 1597d6b..2ebf26b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020080502004425.GD12006@sgi.com\0" "From\0Russ Anderson <rja@sgi.com>\0" "Subject\0[PATCH 3/3] ia64: Call migration code on correctable errors v4\0" - "Date\0Tue, 13 May 2008 23:05:09 +0000\0" + "Date\0Tue, 13 May 2008 18:05:09 -0500\0" "To\0linux-kernel@vger.kernel.org" " linux-ia64@vger.kernel.org\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" @@ -31,7 +30,8 @@ " 7 files changed, 472 insertions(+), 1 deletion(-)\n" "\n" "Index: linus/arch/ia64/kernel/Makefile\n" - "=================================--- linus.orig/arch/ia64/kernel/Makefile\t2008-05-13 16:45:50.039583104 -0500\n" + "===================================================================\n" + "--- linus.orig/arch/ia64/kernel/Makefile\t2008-05-13 16:45:50.039583104 -0500\n" "+++ linus/arch/ia64/kernel/Makefile\t2008-05-13 16:47:50.190357060 -0500\n" "@@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON)\t\t+= perfmon_defaul\n" " obj-$(CONFIG_IA64_CYCLONE)\t+= cyclone.o\n" @@ -42,7 +42,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: linus/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" "+++ linus/arch/ia64/kernel/cpe_migrate.c\t2008-05-13 17:44:33.657066460 -0500\n" "@@ -0,0 +1,418 @@\n" "+/*\n" @@ -114,7 +115,7 @@ "+\tplat_err = (sal_log_platform_err_info_t *)&err_rec->proc_err;\n" "+\n" "+\tguid = 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" @@ -186,7 +187,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" "+\telse\n" "+\t\t/*\n" @@ -273,7 +274,7 @@ "+\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[i].paddr) = PAGE_ALIGN(paddr))\n" + "+\t\t\tif (PAGE_ALIGN(cpe[i].paddr) == PAGE_ALIGN(paddr))\n" "+\t\t\t\treturn 1;\t/* already on the list */\n" "+\t\t}\n" "+\n" @@ -285,7 +286,7 @@ "+\t\treturn 1;\n" "+\t}\n" "+\n" - "+\tif (cpe[cpe_head].paddr = 0) {\n" + "+\tif (cpe[cpe_head].paddr == 0) {\n" "+\t\tcpe[cpe_head].node = node;\n" "+\t\tcpe[cpe_head].paddr = paddr;\n" "+\n" @@ -303,7 +304,8 @@ "+}\n" "+\n" "+/*\n" - "+ * ======================================+ */\n" + "+ * =============================================================================\n" + "+ */\n" "+\n" "+/*\n" "+ * free_one_bad_page\n" @@ -369,7 +371,7 @@ "+\tif (err)\n" "+\t\treturn err;\n" "+\n" - "+\tif (opt = 0)\n" + "+\tif (opt == 0)\n" "+\t\tfree_all_bad_pages();\n" "+\telse\n" "+\t\tfree_one_bad_page(opt);\n" @@ -463,7 +465,8 @@ "+MODULE_DESCRIPTION(\"ia64 Corrected Error page migration driver\");\n" "+MODULE_LICENSE(\"GPL\");\n" "Index: linus/arch/ia64/kernel/mca.c\n" - "=================================--- linus.orig/arch/ia64/kernel/mca.c\t2008-05-13 16:45:50.039583104 -0500\n" + "===================================================================\n" + "--- linus.orig/arch/ia64/kernel/mca.c\t2008-05-13 16:45:50.039583104 -0500\n" "+++ linus/arch/ia64/kernel/mca.c\t2008-05-13 16:47:50.234362472 -0500\n" "@@ -68,6 +68,9 @@\n" " *\n" @@ -535,7 +538,8 @@ " \treturn IRQ_HANDLED;\n" " }\n" "Index: linus/arch/ia64/Kconfig\n" - "=================================--- linus.orig/arch/ia64/Kconfig\t2008-05-13 16:45:50.039583104 -0500\n" + "===================================================================\n" + "--- linus.orig/arch/ia64/Kconfig\t2008-05-13 16:45:50.039583104 -0500\n" "+++ linus/arch/ia64/Kconfig\t2008-05-13 17:16:14.077805136 -0500\n" "@@ -456,6 +456,15 @@ config COMPAT_FOR_U64_ALIGNMENT\n" " config IA64_MCA_RECOVERY\n" @@ -554,7 +558,8 @@ " \tbool \"Performance monitor support\"\n" " \thelp\n" "Index: linus/include/asm-ia64/mca.h\n" - "=================================--- linus.orig/include/asm-ia64/mca.h\t2008-05-13 16:45:50.039583104 -0500\n" + "===================================================================\n" + "--- linus.orig/include/asm-ia64/mca.h\t2008-05-13 16:45:50.039583104 -0500\n" "+++ linus/include/asm-ia64/mca.h\t2008-05-13 17:26:41.519806327 -0500\n" "@@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP\n" " \n" @@ -579,7 +584,8 @@ " struct ia64_mca_notify_die {\n" " \tstruct ia64_sal_os_state *sos;\n" "Index: linus/mm/migrate.c\n" - "=================================--- linus.orig/mm/migrate.c\t2008-05-13 16:45:50.039583104 -0500\n" + "===================================================================\n" + "--- linus.orig/mm/migrate.c\t2008-05-13 16:45:50.039583104 -0500\n" "+++ linus/mm/migrate.c\t2008-05-13 16:47:50.322373295 -0500\n" "@@ -36,6 +36,7 @@\n" " #define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))\n" @@ -622,7 +628,8 @@ " #ifdef CONFIG_NUMA\n" " /*\n" "Index: linus/include/asm-ia64/page.h\n" - "=================================--- linus.orig/include/asm-ia64/page.h\t2008-05-13 16:45:50.039583104 -0500\n" + "===================================================================\n" + "--- linus.orig/include/asm-ia64/page.h\t2008-05-13 16:45:50.039583104 -0500\n" "+++ linus/include/asm-ia64/page.h\t2008-05-13 16:47:50.354377231 -0500\n" "@@ -122,6 +122,7 @@ extern unsigned long max_low_pfn;\n" " #endif\n" @@ -636,4 +643,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -698a44f40ce9fce50e5035fdd69e815c813e7b8fa746ae487e4294b5df28f456 +4b83405ed2cf82a21821b0df59b4a9b721d799c8fd338787a04c53535c8f8916
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.