diff for duplicates of <5084F195.6030908@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index b4531c8..a0a89b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,7 +55,7 @@ Why do you update zone and totalram_pages here? > + } > + > + /* free a pte talbe */ -> + if (i == PTRS_PER_PTE) { +> + if (i = PTRS_PER_PTE) { > + free_pagetable(pmd_page(*pmd)); The memory may be allocated at booting. So it is very dangerous to @@ -77,7 +77,7 @@ free it without any check. > + } > + > + /* free a pmd talbe */ -> + if (i == PTRS_PER_PMD) { +> + if (i = PTRS_PER_PMD) { > + free_pagetable(pud_page(*pud)); > + pud_clear(pud); > + } @@ -95,7 +95,7 @@ free it without any check. > + } > + > + /* free a pud table */ -> + if (i == PTRS_PER_PUD) { +> + if (i = PTRS_PER_PUD) { > + free_pagetable(pgd_page(*pgd)); > + pgd_clear(pgd); > + } @@ -124,7 +124,7 @@ free it without any check. > continue; > > if (pmd_large(*pmd)) { -> - if ((addr & ~PMD_MASK) == 0 && next <= end) { +> - if ((addr & ~PMD_MASK) = 0 && next <= end) { > + if (IS_ALIGNED(addr, PMD_SIZE) && > + IS_ALIGNED(next, PMD_SIZE)) { > set_pmd(pmd, __pmd(0)); @@ -170,7 +170,7 @@ free it without any check. > continue; > > if (pud_large(*pud)) { -> - if ((addr & ~PUD_MASK) == 0 && next <= end) { +> - if ((addr & ~PUD_MASK) = 0 && next <= end) { > + if (IS_ALIGNED(addr, PUD_SIZE) && > + IS_ALIGNED(next, PUD_SIZE)) { > set_pud(pud, __pud(0)); @@ -251,8 +251,7 @@ Wen Congyang >> 3 files changed, 173 insertions(+), 22 deletions(-) >> >> Index: linux-3.6/arch/x86/mm/init_64.c ->> =================================================================== ->> --- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 18:30:21.171698416 +0900 +>> =================================>> --- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 18:30:21.171698416 +0900 >> +++ linux-3.6/arch/x86/mm/init_64.c 2012-10-04 18:30:27.317704652 +0900 >> @@ -675,6 +675,151 @@ int arch_add_memory(int nid, u64 start, >> } @@ -301,7 +300,7 @@ Wen Congyang >> + continue; >> + >> + if (pmd_large(*pmd)) { ->> + if ((addr & ~PMD_MASK) == 0 && next <= end) { +>> + if ((addr & ~PMD_MASK) = 0 && next <= end) { >> + set_pmd(pmd, __pmd(0)); >> + pages++; >> + continue; @@ -348,7 +347,7 @@ Wen Congyang >> + continue; >> + >> + if (pud_large(*pud)) { ->> + if ((addr & ~PUD_MASK) == 0 && next <= end) { +>> + if ((addr & ~PUD_MASK) = 0 && next <= end) { >> + set_pud(pud, __pud(0)); >> + pages++; >> + continue; @@ -416,8 +415,7 @@ Wen Congyang >> } >> #endif >> Index: linux-3.6/arch/x86/include/asm/pgtable_types.h ->> =================================================================== ->> --- linux-3.6.orig/arch/x86/include/asm/pgtable_types.h 2012-10-04 18:26:51.925486954 +0900 +>> =================================>> --- linux-3.6.orig/arch/x86/include/asm/pgtable_types.h 2012-10-04 18:26:51.925486954 +0900 >> +++ linux-3.6/arch/x86/include/asm/pgtable_types.h 2012-10-04 18:30:27.322704656 +0900 >> @@ -334,6 +334,7 @@ static inline void update_page_count(int >> * as a pte too. @@ -428,8 +426,7 @@ Wen Congyang >> #endif /* !__ASSEMBLY__ */ >> >> Index: linux-3.6/arch/x86/mm/pageattr.c ->> =================================================================== ->> --- linux-3.6.orig/arch/x86/mm/pageattr.c 2012-10-04 18:26:51.923486952 +0900 +>> =================================>> --- linux-3.6.orig/arch/x86/mm/pageattr.c 2012-10-04 18:26:51.923486952 +0900 >> +++ linux-3.6/arch/x86/mm/pageattr.c 2012-10-04 18:30:27.328704662 +0900 >> @@ -501,21 +501,13 @@ out_unlock: >> return do_split; @@ -515,10 +512,4 @@ Wen Congyang >> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> >> > -> - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> +> diff --git a/a/content_digest b/N1/content_digest index 61baf5e..289a21e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\05073DFC0.3010400@gmail.com\0" "From\0Wen Congyang <wency@cn.fujitsu.com>\0" "Subject\0Re: [PATCH 8/10] memory-hotplug : remove page table of x86_64 architecture\0" - "Date\0Mon, 22 Oct 2012 15:11:17 +0800\0" + "Date\0Mon, 22 Oct 2012 07:11:17 +0000\0" "To\0wujianguo <wujianguo106@gmail.com>\0" "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" x86@kernel.org @@ -85,7 +85,7 @@ "> +\t}\n" "> +\n" "> +\t/* free a pte talbe */\n" - "> +\tif (i == PTRS_PER_PTE) {\n" + "> +\tif (i = PTRS_PER_PTE) {\n" "> +\t\tfree_pagetable(pmd_page(*pmd));\n" "\n" "The memory may be allocated at booting. So it is very dangerous to\n" @@ -107,7 +107,7 @@ "> +\t}\n" "> +\n" "> +\t/* free a pmd talbe */\n" - "> +\tif (i == PTRS_PER_PMD) {\n" + "> +\tif (i = PTRS_PER_PMD) {\n" "> +\t\tfree_pagetable(pud_page(*pud));\n" "> +\t\tpud_clear(pud);\n" "> +\t}\n" @@ -125,7 +125,7 @@ "> +\t}\n" "> +\n" "> +\t/* free a pud table */\n" - "> +\tif (i == PTRS_PER_PUD) {\n" + "> +\tif (i = PTRS_PER_PUD) {\n" "> +\t\tfree_pagetable(pgd_page(*pgd));\n" "> +\t\tpgd_clear(pgd);\n" "> +\t}\n" @@ -154,7 +154,7 @@ "> \t\t\tcontinue;\n" "> \n" "> \t\tif (pmd_large(*pmd)) {\n" - "> -\t\t\tif ((addr & ~PMD_MASK) == 0 && next <= end) {\n" + "> -\t\t\tif ((addr & ~PMD_MASK) = 0 && next <= end) {\n" "> +\t\t\tif (IS_ALIGNED(addr, PMD_SIZE) &&\n" "> +\t\t\t IS_ALIGNED(next, PMD_SIZE)) {\n" "> \t\t\t\tset_pmd(pmd, __pmd(0));\n" @@ -200,7 +200,7 @@ "> \t\t\tcontinue;\n" "> \n" "> \t\tif (pud_large(*pud)) {\n" - "> -\t\t\tif ((addr & ~PUD_MASK) == 0 && next <= end) {\n" + "> -\t\t\tif ((addr & ~PUD_MASK) = 0 && next <= end) {\n" "> +\t\t\tif (IS_ALIGNED(addr, PUD_SIZE) &&\n" "> +\t\t\t IS_ALIGNED(next, PUD_SIZE)) {\n" "> \t\t\t\tset_pud(pud, __pud(0));\n" @@ -281,8 +281,7 @@ ">> 3 files changed, 173 insertions(+), 22 deletions(-)\n" ">>\n" ">> Index: linux-3.6/arch/x86/mm/init_64.c\n" - ">> ===================================================================\n" - ">> --- linux-3.6.orig/arch/x86/mm/init_64.c\t2012-10-04 18:30:21.171698416 +0900\n" + ">> =================================>> --- linux-3.6.orig/arch/x86/mm/init_64.c\t2012-10-04 18:30:21.171698416 +0900\n" ">> +++ linux-3.6/arch/x86/mm/init_64.c\t2012-10-04 18:30:27.317704652 +0900\n" ">> @@ -675,6 +675,151 @@ int arch_add_memory(int nid, u64 start, \n" ">> }\n" @@ -331,7 +330,7 @@ ">> +\t\t\tcontinue;\n" ">> +\n" ">> +\t\tif (pmd_large(*pmd)) {\n" - ">> +\t\t\tif ((addr & ~PMD_MASK) == 0 && next <= end) {\n" + ">> +\t\t\tif ((addr & ~PMD_MASK) = 0 && next <= end) {\n" ">> +\t\t\t\tset_pmd(pmd, __pmd(0));\n" ">> +\t\t\t\tpages++;\n" ">> +\t\t\t\tcontinue;\n" @@ -378,7 +377,7 @@ ">> +\t\t\tcontinue;\n" ">> +\n" ">> +\t\tif (pud_large(*pud)) {\n" - ">> +\t\t\tif ((addr & ~PUD_MASK) == 0 && next <= end) {\n" + ">> +\t\t\tif ((addr & ~PUD_MASK) = 0 && next <= end) {\n" ">> +\t\t\t\tset_pud(pud, __pud(0));\n" ">> +\t\t\t\tpages++;\n" ">> +\t\t\t\tcontinue;\n" @@ -446,8 +445,7 @@ ">> }\n" ">> #endif\n" ">> Index: linux-3.6/arch/x86/include/asm/pgtable_types.h\n" - ">> ===================================================================\n" - ">> --- linux-3.6.orig/arch/x86/include/asm/pgtable_types.h\t2012-10-04 18:26:51.925486954 +0900\n" + ">> =================================>> --- linux-3.6.orig/arch/x86/include/asm/pgtable_types.h\t2012-10-04 18:26:51.925486954 +0900\n" ">> +++ linux-3.6/arch/x86/include/asm/pgtable_types.h\t2012-10-04 18:30:27.322704656 +0900\n" ">> @@ -334,6 +334,7 @@ static inline void update_page_count(int\n" ">> * as a pte too.\n" @@ -458,8 +456,7 @@ ">> #endif\t/* !__ASSEMBLY__ */\n" ">> \n" ">> Index: linux-3.6/arch/x86/mm/pageattr.c\n" - ">> ===================================================================\n" - ">> --- linux-3.6.orig/arch/x86/mm/pageattr.c\t2012-10-04 18:26:51.923486952 +0900\n" + ">> =================================>> --- linux-3.6.orig/arch/x86/mm/pageattr.c\t2012-10-04 18:26:51.923486952 +0900\n" ">> +++ linux-3.6/arch/x86/mm/pageattr.c\t2012-10-04 18:30:27.328704662 +0900\n" ">> @@ -501,21 +501,13 @@ out_unlock:\n" ">> \treturn do_split;\n" @@ -545,12 +542,6 @@ ">> Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>\n" ">>\n" "> \n" - "> \n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + > -f568af7de714f8a6fe4fd66dc39047aa3e516411c9c7f76aa0f48c9310fd85fc +b8245224a6713ffeb0c74b25e57065460689d4b8e5dfca6dea8c7dab8aae6105
diff --git a/a/1.txt b/N2/1.txt index b4531c8..b1d58b9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -515,10 +515,4 @@ Wen Congyang >> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> >> > -> - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> +> diff --git a/a/content_digest b/N2/content_digest index 61baf5e..0743e6a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,27 +5,27 @@ "Subject\0Re: [PATCH 8/10] memory-hotplug : remove page table of x86_64 architecture\0" "Date\0Mon, 22 Oct 2012 15:11:17 +0800\0" "To\0wujianguo <wujianguo106@gmail.com>\0" - "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" - x86@kernel.org - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0linux-s390@vger.kernel.org" + linux-ia64@vger.kernel.org + jiang.liu@huawei.com + len.brown@intel.com linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org + wujianguo@huawei.com + x86@kernel.org + linux-kernel@vger.kernel.org cmetcalf@tilera.com - sparclinux@vger.kernel.org - rientjes@google.com - liuj97@gmail.com - len.brown@intel.com - cl@linux.com + linux-mm@kvack.org + Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> minchan.kim@gmail.com - akpm@linux-foundation.org kosaki.motohiro@jp.fujitsu.com - wujianguo@huawei.com + rientjes@google.com + sparclinux@vger.kernel.org qiuxishi@huawei.com - " jiang.liu@huawei.com\0" + cl@linux.com + linuxppc-dev@lists.ozlabs.org + akpm@linux-foundation.org + " liuj97@gmail.com\0" "\00:1\0" "b\0" "Hi, Wu\n" @@ -545,12 +545,6 @@ ">> Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>\n" ">>\n" "> \n" - "> \n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + > -f568af7de714f8a6fe4fd66dc39047aa3e516411c9c7f76aa0f48c9310fd85fc +188e890fa8cf1a2d285e734f034f0c23b6511378c9241ce7f02048dbc1ba2455
diff --git a/a/1.txt b/N3/1.txt index b4531c8..b1d58b9 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -515,10 +515,4 @@ Wen Congyang >> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> >> > -> - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> +> diff --git a/a/content_digest b/N3/content_digest index 61baf5e..fc61ac3 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -545,12 +545,6 @@ ">> Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>\n" ">>\n" "> \n" - "> \n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + > -f568af7de714f8a6fe4fd66dc39047aa3e516411c9c7f76aa0f48c9310fd85fc +8701c0cb1a69f28ba88ef54bcd3203537eb882c65df158f0cc2c58847ae01ff3
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.