diff for duplicates of <5073DFC0.3010400@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 67a91b7..9d91a08 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ index 5596dfa..81f9c3b 100644 + } + + /* free a pte talbe */ -+ if (i == PTRS_PER_PTE) { ++ if (i = PTRS_PER_PTE) { + free_pagetable(pmd_page(*pmd)); + pmd_clear(pmd); + } @@ -62,7 +62,7 @@ index 5596dfa..81f9c3b 100644 + } + + /* free a pmd talbe */ -+ if (i == PTRS_PER_PMD) { ++ if (i = PTRS_PER_PMD) { + free_pagetable(pud_page(*pud)); + pud_clear(pud); + } @@ -80,7 +80,7 @@ index 5596dfa..81f9c3b 100644 + } + + /* free a pud table */ -+ if (i == PTRS_PER_PUD) { ++ if (i = PTRS_PER_PUD) { + free_pagetable(pgd_page(*pgd)); + pgd_clear(pgd); + } @@ -109,7 +109,7 @@ index 5596dfa..81f9c3b 100644 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)); @@ -155,7 +155,7 @@ index 5596dfa..81f9c3b 100644 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)); @@ -228,8 +228,7 @@ On 2012-10-5 10:36, Yasuaki Ishimatsu wrote: > 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, > } @@ -278,7 +277,7 @@ On 2012-10-5 10:36, Yasuaki Ishimatsu wrote: > + 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; @@ -325,7 +324,7 @@ On 2012-10-5 10:36, Yasuaki Ishimatsu wrote: > + 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; @@ -393,8 +392,7 @@ On 2012-10-5 10:36, Yasuaki Ishimatsu wrote: > } > #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. @@ -405,8 +403,7 @@ On 2012-10-5 10:36, Yasuaki Ishimatsu wrote: > #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; diff --git a/a/content_digest b/N1/content_digest index efc1e9f..35b57ce 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0506E4799.30407@jp.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, 09 Oct 2012 16:26:40 +0800\0" + "Date\0Tue, 09 Oct 2012 08:26:40 +0000\0" "To\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Cc\0x86@kernel.org" linux-mm@kvack.org @@ -73,7 +73,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" "+\t\tpmd_clear(pmd);\n" "+\t}\n" @@ -91,7 +91,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" @@ -109,7 +109,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" @@ -138,7 +138,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" @@ -184,7 +184,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" @@ -257,8 +257,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" @@ -307,7 +306,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" @@ -354,7 +353,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" @@ -422,8 +421,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" @@ -434,8 +432,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" @@ -521,4 +518,4 @@ "> Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>\n" > -ea42471bca4b8e17b50c2151be9b246054c5d3113a5a646bb11de7a35aee525a +73bc639659ecac9dee11d5214a737f3906e058cffa009cad2e149a8aed915af4
diff --git a/a/content_digest b/N2/content_digest index efc1e9f..db76b3e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,27 +4,27 @@ "Subject\0Re: [PATCH 8/10] memory-hotplug : remove page table of x86_64 architecture\0" "Date\0Tue, 09 Oct 2012 16:26:40 +0800\0" "To\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" - "Cc\0x86@kernel.org" - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0linux-s390@vger.kernel.org" + jiang.liu@huawei.com + linux-ia64@vger.kernel.org + wency@cn.fujitsu.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 minchan.kim@gmail.com - akpm@linux-foundation.org kosaki.motohiro@jp.fujitsu.com - wency@cn.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 Congyang,\n" @@ -521,4 +521,4 @@ "> Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>\n" > -ea42471bca4b8e17b50c2151be9b246054c5d3113a5a646bb11de7a35aee525a +a1b5db4cfe7552863adb4cf64fc542ce1816187822ced5f18b831563b9c5bb9b
diff --git a/a/1.txt b/N3/1.txt index 67a91b7..d481e9d 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -490,4 +490,10 @@ On 2012-10-5 10:36, Yasuaki Ishimatsu wrote: > 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> -> +> + +-- +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 efc1e9f..e4af028 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -519,6 +519,12 @@ "> 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>\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>" -ea42471bca4b8e17b50c2151be9b246054c5d3113a5a646bb11de7a35aee525a +4c1fbfc5e3ac6659d41b0931f22364d7b8e89cebcbcae1fda8226998c355f438
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.