diff for duplicates of <50864A32.6000608@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index bf11c4c..ac15a86 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -87,7 +87,7 @@ This verson looks fine to me. >>> + } >>> + >>> + /* 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 @@ -119,7 +119,7 @@ Wen Congyang >>> + } >>> + >>> + /* free a pmd talbe */ ->>> + if (i == PTRS_PER_PMD) { +>>> + if (i = PTRS_PER_PMD) { >>> + free_pagetable(pud_page(*pud)); >>> + pud_clear(pud); >>> + } @@ -137,7 +137,7 @@ Wen Congyang >>> + } >>> + >>> + /* free a pud table */ ->>> + if (i == PTRS_PER_PUD) { +>>> + if (i = PTRS_PER_PUD) { >>> + free_pagetable(pgd_page(*pgd)); >>> + pgd_clear(pgd); >>> + } @@ -166,7 +166,7 @@ Wen Congyang >>> 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)); @@ -212,7 +212,7 @@ Wen Congyang >>> 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)); @@ -298,8 +298,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, >>>> } @@ -348,7 +347,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; @@ -395,7 +394,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; @@ -463,8 +462,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. @@ -475,8 +473,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; @@ -566,10 +563,4 @@ Wen Congyang >> >> > -> - --- -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 c7f74a4..d46f876 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\050864297.9010708@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\0Tue, 23 Oct 2012 15:41:38 +0800\0" + "Date\0Tue, 23 Oct 2012 07:41:38 +0000\0" "To\0wujianguo <wujianguo106@gmail.com>\0" "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" x86@kernel.org @@ -119,7 +119,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" @@ -151,7 +151,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" @@ -169,7 +169,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" @@ -198,7 +198,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" @@ -244,7 +244,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" @@ -330,8 +330,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" @@ -380,7 +379,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" @@ -427,7 +426,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" @@ -495,8 +494,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" @@ -507,8 +505,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" @@ -598,12 +595,6 @@ ">>\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>" + > -91ae48895dfb99348833e29e2224405d24c2a1d9ad3f7dd0a1477a4bf9d4076a +04ad9ed9e5bbc1e035c27ac6751e2618a16b4aea5f9f592ea6f88cd454aaec97
diff --git a/a/1.txt b/N2/1.txt index bf11c4c..84e5042 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -566,10 +566,4 @@ Wen Congyang >> >> > -> - --- -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 c7f74a4..80bcaf9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,27 +7,27 @@ "Subject\0Re: [PATCH 8/10] memory-hotplug : remove page table of x86_64 architecture\0" "Date\0Tue, 23 Oct 2012 15:41:38 +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" "At 10/23/2012 03:09 PM, wujianguo Wrote:\n" @@ -598,12 +598,6 @@ ">>\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>" + > -91ae48895dfb99348833e29e2224405d24c2a1d9ad3f7dd0a1477a4bf9d4076a +5f889a0548cbca488e9082c1e5aa2b6c1e93bd7e83f7091328ad54f55447d41d
diff --git a/a/1.txt b/N3/1.txt index bf11c4c..84e5042 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -566,10 +566,4 @@ Wen Congyang >> >> > -> - --- -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 c7f74a4..40f489c 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -598,12 +598,6 @@ ">>\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>" + > -91ae48895dfb99348833e29e2224405d24c2a1d9ad3f7dd0a1477a4bf9d4076a +1509899baf967143273e04e5e724c3c24f8e2b8e4ef0fda2e20a06e85d005757
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.