diff for duplicates of <50864297.9010708@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 6ebdc44..1e91ab9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -83,7 +83,7 @@ static inline void free_pagetable(struct page *page) >> + } >> + >> + /* 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 @@ -108,7 +108,7 @@ entries have been cleared, right? >> + } >> + >> + /* free a pmd talbe */ ->> + if (i == PTRS_PER_PMD) { +>> + if (i = PTRS_PER_PMD) { >> + free_pagetable(pud_page(*pud)); >> + pud_clear(pud); >> + } @@ -126,7 +126,7 @@ entries have been cleared, right? >> + } >> + >> + /* free a pud table */ ->> + if (i == PTRS_PER_PUD) { +>> + if (i = PTRS_PER_PUD) { >> + free_pagetable(pgd_page(*pgd)); >> + pgd_clear(pgd); >> + } @@ -155,7 +155,7 @@ entries have been cleared, right? >> 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)); @@ -201,7 +201,7 @@ entries have been cleared, right? >> 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)); @@ -287,8 +287,7 @@ Jianguo Wu >>> 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, >>> } @@ -337,7 +336,7 @@ Jianguo Wu >>> + 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; @@ -384,7 +383,7 @@ Jianguo Wu >>> + 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; @@ -452,8 +451,7 @@ Jianguo Wu >>> } >>> #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. @@ -464,8 +462,7 @@ Jianguo Wu >>> #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; @@ -553,10 +550,4 @@ Jianguo Wu >> >> > -> - --- -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 dbe3586..ce309f0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\05084F195.6030908@cn.fujitsu.com\0" "From\0wujianguo <wujianguo106@gmail.com>\0" "Subject\0Re: [PATCH 8/10] memory-hotplug : remove page table of x86_64 architecture\0" - "Date\0Tue, 23 Oct 2012 15:09:11 +0800\0" + "Date\0Tue, 23 Oct 2012 07:09:11 +0000\0" "To\0Wen Congyang <wency@cn.fujitsu.com>\0" "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" x86@kernel.org @@ -114,7 +114,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" @@ -139,7 +139,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" @@ -157,7 +157,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" @@ -186,7 +186,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" @@ -232,7 +232,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" @@ -318,8 +318,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" @@ -368,7 +367,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" @@ -415,7 +414,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" @@ -483,8 +482,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" @@ -495,8 +493,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" @@ -584,12 +581,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>" + > -01c77ff29ef8925ca615a9003b1cf9d34e67a356289db134d63d135440220328 +030e6a505808d3b1f71501b218b2530abd6d322bf565605d671495c3e3a2d2aa
diff --git a/a/1.txt b/N2/1.txt index 6ebdc44..f34c9fa 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -553,10 +553,4 @@ Jianguo Wu >> >> > -> - --- -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 dbe3586..abae692 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,27 +6,27 @@ "Subject\0Re: [PATCH 8/10] memory-hotplug : remove page table of x86_64 architecture\0" "Date\0Tue, 23 Oct 2012 15:09:11 +0800\0" "To\0Wen Congyang <wency@cn.fujitsu.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" "On 2012-10-22 15:11, Wen Congyang wrote:\n" @@ -584,12 +584,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>" + > -01c77ff29ef8925ca615a9003b1cf9d34e67a356289db134d63d135440220328 +ae681cc37f9985b0b4a40bc8b94075dfa01c8dd27f1b4a13c1bc415fae878d71
diff --git a/a/1.txt b/N3/1.txt index 6ebdc44..f34c9fa 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -553,10 +553,4 @@ Jianguo Wu >> >> > -> - --- -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 dbe3586..a604127 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -584,12 +584,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>" + > -01c77ff29ef8925ca615a9003b1cf9d34e67a356289db134d63d135440220328 +9d0dfab220032f68b38330d51185c180d07adf846f8022964ff9771aa373680d
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.