diff for duplicates of <20080718203653.GF29621@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 10bf915..15a3bb5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,8 @@ Signed-off-by: Russ Anderson <rja@sgi.com> 7 files changed, 476 insertions(+), 1 deletion(-) Index: linux/arch/ia64/kernel/Makefile -=================================--- linux.orig/arch/ia64/kernel/Makefile 2008-07-18 15:15:48.000000000 -0500 +=================================================================== +--- linux.orig/arch/ia64/kernel/Makefile 2008-07-18 15:15:48.000000000 -0500 +++ linux/arch/ia64/kernel/Makefile 2008-07-18 15:16:23.000000000 -0500 @@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON) += perfmon_defaul obj-$(CONFIG_IA64_CYCLONE) += cyclone.o @@ -31,7 +32,8 @@ Index: linux/arch/ia64/kernel/Makefile obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o Index: linux/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 +++ linux/arch/ia64/kernel/cpe_migrate.c 2008-07-18 15:16:23.000000000 -0500 @@ -0,0 +1,419 @@ +/* @@ -103,7 +105,7 @@ Index: linux/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 + */ @@ -175,7 +177,7 @@ Index: linux/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) { + total_badpages++; + list_add_tail(&page->lru, &badpagelist); + } else @@ -263,7 +265,7 @@ Index: linux/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 */ + } + @@ -275,7 +277,7 @@ Index: linux/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; + @@ -293,7 +295,8 @@ Index: linux/arch/ia64/kernel/cpe_migrate.c +} + +/* -+ * ======================================+ */ ++ * ============================================================================= ++ */ + +/* + * free_one_bad_page @@ -359,7 +362,7 @@ Index: linux/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); @@ -453,7 +456,8 @@ Index: linux/arch/ia64/kernel/cpe_migrate.c +MODULE_DESCRIPTION("ia64 Corrected Error page migration driver"); +MODULE_LICENSE("GPL"); Index: linux/arch/ia64/kernel/mca.c -=================================--- linux.orig/arch/ia64/kernel/mca.c 2008-07-18 15:15:48.000000000 -0500 +=================================================================== +--- linux.orig/arch/ia64/kernel/mca.c 2008-07-18 15:15:48.000000000 -0500 +++ linux/arch/ia64/kernel/mca.c 2008-07-18 15:16:23.000000000 -0500 @@ -68,6 +68,9 @@ * @@ -528,7 +532,8 @@ Index: linux/arch/ia64/kernel/mca.c return IRQ_HANDLED; } Index: linux/arch/ia64/Kconfig -=================================--- linux.orig/arch/ia64/Kconfig 2008-07-18 15:15:48.000000000 -0500 +=================================================================== +--- linux.orig/arch/ia64/Kconfig 2008-07-18 15:15:48.000000000 -0500 +++ linux/arch/ia64/Kconfig 2008-07-18 15:16:23.000000000 -0500 @@ -470,6 +470,15 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY @@ -547,7 +552,8 @@ Index: linux/arch/ia64/Kconfig bool "Performance monitor support" help Index: linux/include/asm-ia64/mca.h -=================================--- linux.orig/include/asm-ia64/mca.h 2008-07-18 15:15:48.000000000 -0500 +=================================================================== +--- linux.orig/include/asm-ia64/mca.h 2008-07-18 15:15:48.000000000 -0500 +++ linux/include/asm-ia64/mca.h 2008-07-18 15:16:23.000000000 -0500 @@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP @@ -573,7 +579,8 @@ Index: linux/include/asm-ia64/mca.h struct ia64_mca_notify_die { struct ia64_sal_os_state *sos; Index: linux/include/asm-ia64/page.h -=================================--- linux.orig/include/asm-ia64/page.h 2008-07-18 15:15:48.000000000 -0500 +=================================================================== +--- linux.orig/include/asm-ia64/page.h 2008-07-18 15:15:48.000000000 -0500 +++ linux/include/asm-ia64/page.h 2008-07-18 15:16:23.000000000 -0500 @@ -122,6 +122,7 @@ extern unsigned long max_low_pfn; #endif @@ -584,7 +591,8 @@ Index: linux/include/asm-ia64/page.h #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) Index: linux/mm/migrate.c -=================================--- linux.orig/mm/migrate.c 2008-07-18 15:16:09.000000000 -0500 +=================================================================== +--- linux.orig/mm/migrate.c 2008-07-18 15:16:09.000000000 -0500 +++ linux/mm/migrate.c 2008-07-18 15:16:23.000000000 -0500 @@ -64,6 +64,7 @@ int isolate_lru_page(struct page *page, } diff --git a/a/content_digest b/N1/content_digest index c623b34..f1f9d06 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 v7\0" - "Date\0Fri, 18 Jul 2008 20:36:53 +0000\0" + "Date\0Fri, 18 Jul 2008 15:36:53 -0500\0" "To\0mingo@elte.hu" tglx@linutronix.de " Tony Luck <tony.luck@intel.com>\0" @@ -31,7 +31,8 @@ " 7 files changed, 476 insertions(+), 1 deletion(-)\n" "\n" "Index: linux/arch/ia64/kernel/Makefile\n" - "=================================--- linux.orig/arch/ia64/kernel/Makefile\t2008-07-18 15:15:48.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/Makefile\t2008-07-18 15:15:48.000000000 -0500\n" "+++ linux/arch/ia64/kernel/Makefile\t2008-07-18 15:16:23.000000000 -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: linux/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" "+++ linux/arch/ia64/kernel/cpe_migrate.c\t2008-07-18 15:16:23.000000000 -0500\n" "@@ -0,0 +1,419 @@\n" "+/*\n" @@ -114,7 +116,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 +188,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\ttotal_badpages++;\n" "+\t\tlist_add_tail(&page->lru, &badpagelist);\n" "+\t} else\n" @@ -274,7 +276,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" @@ -286,7 +288,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" @@ -304,7 +306,8 @@ "+}\n" "+\n" "+/*\n" - "+ * ======================================+ */\n" + "+ * =============================================================================\n" + "+ */\n" "+\n" "+/*\n" "+ * free_one_bad_page\n" @@ -370,7 +373,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" @@ -464,7 +467,8 @@ "+MODULE_DESCRIPTION(\"ia64 Corrected Error page migration driver\");\n" "+MODULE_LICENSE(\"GPL\");\n" "Index: linux/arch/ia64/kernel/mca.c\n" - "=================================--- linux.orig/arch/ia64/kernel/mca.c\t2008-07-18 15:15:48.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/mca.c\t2008-07-18 15:15:48.000000000 -0500\n" "+++ linux/arch/ia64/kernel/mca.c\t2008-07-18 15:16:23.000000000 -0500\n" "@@ -68,6 +68,9 @@\n" " *\n" @@ -539,7 +543,8 @@ " \treturn IRQ_HANDLED;\n" " }\n" "Index: linux/arch/ia64/Kconfig\n" - "=================================--- linux.orig/arch/ia64/Kconfig\t2008-07-18 15:15:48.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/Kconfig\t2008-07-18 15:15:48.000000000 -0500\n" "+++ linux/arch/ia64/Kconfig\t2008-07-18 15:16:23.000000000 -0500\n" "@@ -470,6 +470,15 @@ config COMPAT_FOR_U64_ALIGNMENT\n" " config IA64_MCA_RECOVERY\n" @@ -558,7 +563,8 @@ " \tbool \"Performance monitor support\"\n" " \thelp\n" "Index: linux/include/asm-ia64/mca.h\n" - "=================================--- linux.orig/include/asm-ia64/mca.h\t2008-07-18 15:15:48.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/include/asm-ia64/mca.h\t2008-07-18 15:15:48.000000000 -0500\n" "+++ linux/include/asm-ia64/mca.h\t2008-07-18 15:16:23.000000000 -0500\n" "@@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP\n" " \n" @@ -584,7 +590,8 @@ " struct ia64_mca_notify_die {\n" " \tstruct ia64_sal_os_state *sos;\n" "Index: linux/include/asm-ia64/page.h\n" - "=================================--- linux.orig/include/asm-ia64/page.h\t2008-07-18 15:15:48.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/include/asm-ia64/page.h\t2008-07-18 15:15:48.000000000 -0500\n" "+++ linux/include/asm-ia64/page.h\t2008-07-18 15:16:23.000000000 -0500\n" "@@ -122,6 +122,7 @@ extern unsigned long max_low_pfn;\n" " #endif\n" @@ -595,7 +602,8 @@ " #define pfn_to_kaddr(pfn)\t__va((pfn) << PAGE_SHIFT)\n" " \n" "Index: linux/mm/migrate.c\n" - "=================================--- linux.orig/mm/migrate.c\t2008-07-18 15:16:09.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/mm/migrate.c\t2008-07-18 15:16:09.000000000 -0500\n" "+++ linux/mm/migrate.c\t2008-07-18 15:16:23.000000000 -0500\n" "@@ -64,6 +64,7 @@ int isolate_lru_page(struct page *page, \n" " \t}\n" @@ -633,4 +641,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -10c8daa0e3ecb5b5dc09e22020bb8ce9e423f435f99ad4e29bffb0e60d940c94 +6beed75c78646e1b63e8b43e5202d103d2f1a83979f33e2d6a5e7af236a8095c
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.