diff for duplicates of <20080502004425.GD12006@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 06329dc..62f0c69 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,8 @@ Signed-off-by: Russ Anderson <rja@sgi.com> 9 files changed, 434 insertions(+), 2 deletions(-) Index: linus/arch/ia64/kernel/Makefile -=================================--- linus.orig/arch/ia64/kernel/Makefile 2008-05-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/arch/ia64/kernel/Makefile 2008-05-01 19:36:40.000000000 -0500 +++ linus/arch/ia64/kernel/Makefile 2008-05-01 19:36:49.000000000 -0500 @@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON) += perfmon_defaul obj-$(CONFIG_IA64_CYCLONE) += cyclone.o @@ -31,7 +32,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-01 19:36:49.000000000 -0500 @@ -0,0 +1,382 @@ +/* @@ -111,7 +113,7 @@ Index: linus/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 + */ @@ -179,7 +181,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); + + spin_unlock_irqrestore(&cpe_migrate_lock, irq_flags); @@ -254,15 +256,15 @@ Index: linus/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; + @@ -279,7 +281,8 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c +} + +/* -+ * ======================================+ */ ++ * ============================================================================= ++ */ + +int +freeOneBadPage(unsigned long paddr) @@ -334,7 +337,7 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c + optstr[len] = '\0'; + + opt = simple_strtoul(optstr, NULL, 0); -+ if (opt = 0) ++ if (opt == 0) + freeAllBadPages(); + else + freeOneBadPage(opt); @@ -388,7 +391,7 @@ Index: linus/arch/ia64/kernel/cpe_migrate.c + cpe_poll_enabled = cpe_polling_enabled; + + proc_badpage = create_proc_entry(BADRAM_BASENAME, 0644, NULL); -+ if (proc_badpage = NULL) { ++ if (proc_badpage == NULL) { + printk(KERN_ERR "unable to create %s proc entry", + BADRAM_BASENAME); + return -EINVAL; @@ -416,7 +419,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-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/arch/ia64/kernel/mca.c 2008-05-01 19:36:40.000000000 -0500 +++ linus/arch/ia64/kernel/mca.c 2008-05-01 19:36:49.000000000 -0500 @@ -68,6 +68,9 @@ * @@ -488,7 +492,8 @@ Index: linus/arch/ia64/kernel/mca.c return IRQ_HANDLED; } Index: linus/arch/ia64/Kconfig -=================================--- linus.orig/arch/ia64/Kconfig 2008-05-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/arch/ia64/Kconfig 2008-05-01 19:36:40.000000000 -0500 +++ linus/arch/ia64/Kconfig 2008-05-01 19:36:49.000000000 -0500 @@ -456,6 +456,9 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY @@ -501,7 +506,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-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/include/asm-ia64/mca.h 2008-05-01 19:36:40.000000000 -0500 +++ linus/include/asm-ia64/mca.h 2008-05-01 19:36:49.000000000 -0500 @@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP @@ -526,7 +532,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-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/mm/migrate.c 2008-05-01 19:36:40.000000000 -0500 +++ linus/mm/migrate.c 2008-05-01 19:36:49.000000000 -0500 @@ -64,6 +64,7 @@ int isolate_lru_page(struct page *page, } @@ -572,7 +579,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-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/include/asm-ia64/page.h 2008-05-01 19:36:40.000000000 -0500 +++ linus/include/asm-ia64/page.h 2008-05-01 19:36:49.000000000 -0500 @@ -122,6 +122,7 @@ extern unsigned long max_low_pfn; #endif @@ -583,7 +591,8 @@ Index: linus/include/asm-ia64/page.h #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) Index: linus/mm/page_alloc.c -=================================--- linus.orig/mm/page_alloc.c 2008-05-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/mm/page_alloc.c 2008-05-01 19:36:40.000000000 -0500 +++ linus/mm/page_alloc.c 2008-05-01 19:36:49.000000000 -0500 @@ -72,6 +72,7 @@ unsigned long totalreserve_pages __read_ long nr_swap_pages; @@ -594,7 +603,8 @@ Index: linus/mm/page_alloc.c #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE int pageblock_order __read_mostly; Index: linus/include/linux/migrate.h -=================================--- linus.orig/include/linux/migrate.h 2008-05-01 19:36:40.000000000 -0500 +=================================================================== +--- linus.orig/include/linux/migrate.h 2008-05-01 19:36:40.000000000 -0500 +++ linus/include/linux/migrate.h 2008-05-01 19:36:49.000000000 -0500 @@ -38,6 +38,7 @@ extern int migrate_prep(void); extern int migrate_vmas(struct mm_struct *mm, diff --git a/a/content_digest b/N1/content_digest index bf3dec6..52eecd8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Russ Anderson <rja@sgi.com>\0" "Subject\0[PATCH 3/3] ia64: Call migration code on correctable errors v2\0" - "Date\0Fri, 02 May 2008 00:44:25 +0000\0" + "Date\0Thu, 1 May 2008 19:44:25 -0500\0" "To\0linux-kernel@vger.kernel.org" " linux-ia64@vger.kernel.org\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" @@ -32,7 +32,8 @@ " 9 files changed, 434 insertions(+), 2 deletions(-)\n" "\n" "Index: linus/arch/ia64/kernel/Makefile\n" - "=================================--- linus.orig/arch/ia64/kernel/Makefile\t2008-05-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/arch/ia64/kernel/Makefile\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/arch/ia64/kernel/Makefile\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON)\t\t+= perfmon_defaul\n" " obj-$(CONFIG_IA64_CYCLONE)\t+= cyclone.o\n" @@ -43,7 +44,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-01 19:36:49.000000000 -0500\n" "@@ -0,0 +1,382 @@\n" "+/*\n" @@ -123,7 +125,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" @@ -191,7 +193,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" @@ -266,15 +268,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" @@ -291,7 +293,8 @@ "+}\n" "+\n" "+/*\n" - "+ * ======================================+ */\n" + "+ * =============================================================================\n" + "+ */\n" "+\n" "+int\n" "+freeOneBadPage(unsigned long paddr)\n" @@ -346,7 +349,7 @@ "+\toptstr[len] = '\\0';\n" "+\n" "+\topt = simple_strtoul(optstr, NULL, 0);\n" - "+\tif (opt = 0)\n" + "+\tif (opt == 0)\n" "+\t\tfreeAllBadPages();\n" "+\telse\n" "+\t\tfreeOneBadPage(opt);\n" @@ -400,7 +403,7 @@ "+\tcpe_poll_enabled = cpe_polling_enabled;\n" "+\n" "+\tproc_badpage = create_proc_entry(BADRAM_BASENAME, 0644, NULL);\n" - "+\tif (proc_badpage = NULL) {\n" + "+\tif (proc_badpage == NULL) {\n" "+\t\tprintk(KERN_ERR \"unable to create %s proc entry\",\n" "+\t\t\t\tBADRAM_BASENAME);\n" "+\t\treturn -EINVAL;\n" @@ -428,7 +431,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-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/arch/ia64/kernel/mca.c\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/arch/ia64/kernel/mca.c\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -68,6 +68,9 @@\n" " *\n" @@ -500,7 +504,8 @@ " \treturn IRQ_HANDLED;\n" " }\n" "Index: linus/arch/ia64/Kconfig\n" - "=================================--- linus.orig/arch/ia64/Kconfig\t2008-05-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/arch/ia64/Kconfig\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/arch/ia64/Kconfig\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -456,6 +456,9 @@ config COMPAT_FOR_U64_ALIGNMENT\n" " config IA64_MCA_RECOVERY\n" @@ -513,7 +518,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-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/include/asm-ia64/mca.h\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/include/asm-ia64/mca.h\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -137,6 +137,7 @@ extern unsigned long __per_cpu_mca[NR_CP\n" " \n" @@ -538,7 +544,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-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/mm/migrate.c\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/mm/migrate.c\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -64,6 +64,7 @@ int isolate_lru_page(struct page *page, \n" " \t}\n" @@ -584,7 +591,8 @@ " #ifdef CONFIG_NUMA\n" " /*\n" "Index: linus/include/asm-ia64/page.h\n" - "=================================--- linus.orig/include/asm-ia64/page.h\t2008-05-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/include/asm-ia64/page.h\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/include/asm-ia64/page.h\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -122,6 +122,7 @@ extern unsigned long max_low_pfn;\n" " #endif\n" @@ -595,7 +603,8 @@ " #define pfn_to_kaddr(pfn)\t__va((pfn) << PAGE_SHIFT)\n" " \n" "Index: linus/mm/page_alloc.c\n" - "=================================--- linus.orig/mm/page_alloc.c\t2008-05-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/mm/page_alloc.c\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/mm/page_alloc.c\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -72,6 +72,7 @@ unsigned long totalreserve_pages __read_\n" " long nr_swap_pages;\n" @@ -606,7 +615,8 @@ " #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE\n" " int pageblock_order __read_mostly;\n" "Index: linus/include/linux/migrate.h\n" - "=================================--- linus.orig/include/linux/migrate.h\t2008-05-01 19:36:40.000000000 -0500\n" + "===================================================================\n" + "--- linus.orig/include/linux/migrate.h\t2008-05-01 19:36:40.000000000 -0500\n" "+++ linus/include/linux/migrate.h\t2008-05-01 19:36:49.000000000 -0500\n" "@@ -38,6 +38,7 @@ extern int migrate_prep(void);\n" " extern int migrate_vmas(struct mm_struct *mm,\n" @@ -628,4 +638,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -e74adeec95477a264c49939f8f067e08852e577813e258cc9008a8d5889778dd +0e078af6f9db29a48fb8fd94a8d8fb5c1c536403797881717f8c216106a7ca9f
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.