diff for duplicates of <506E4741.6080402@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 6b07d43..58c07f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,8 +35,7 @@ Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> 8 files changed, 158 insertions(+), 17 deletions(-) Index: linux-3.6/arch/ia64/mm/discontig.c -=================================================================== ---- linux-3.6.orig/arch/ia64/mm/discontig.c 2012-10-04 18:30:15.475692638 +0900 +=================================--- linux-3.6.orig/arch/ia64/mm/discontig.c 2012-10-04 18:30:15.475692638 +0900 +++ linux-3.6/arch/ia64/mm/discontig.c 2012-10-04 18:30:21.145698389 +0900 @@ -823,6 +823,14 @@ int __meminit vmemmap_populate(struct pa return vmemmap_populate_basepages(start_page, size, node); @@ -54,8 +53,7 @@ Index: linux-3.6/arch/ia64/mm/discontig.c struct page *start_page, unsigned long size) { Index: linux-3.6/arch/powerpc/mm/init_64.c -=================================================================== ---- linux-3.6.orig/arch/powerpc/mm/init_64.c 2012-10-04 18:30:15.494692657 +0900 +=================================--- linux-3.6.orig/arch/powerpc/mm/init_64.c 2012-10-04 18:30:15.494692657 +0900 +++ linux-3.6/arch/powerpc/mm/init_64.c 2012-10-04 18:30:21.150698394 +0900 @@ -299,6 +299,14 @@ int __meminit vmemmap_populate(struct pa return 0; @@ -73,8 +71,7 @@ Index: linux-3.6/arch/powerpc/mm/init_64.c struct page *start_page, unsigned long size) { Index: linux-3.6/arch/s390/mm/vmem.c -=================================================================== ---- linux-3.6.orig/arch/s390/mm/vmem.c 2012-10-04 18:30:15.506692670 +0900 +=================================--- linux-3.6.orig/arch/s390/mm/vmem.c 2012-10-04 18:30:15.506692670 +0900 +++ linux-3.6/arch/s390/mm/vmem.c 2012-10-04 18:30:21.157698401 +0900 @@ -227,6 +227,14 @@ out: return ret; @@ -92,8 +89,7 @@ Index: linux-3.6/arch/s390/mm/vmem.c struct page *start_page, unsigned long size) { Index: linux-3.6/arch/sparc/mm/init_64.c -=================================================================== ---- linux-3.6.orig/arch/sparc/mm/init_64.c 2012-10-04 18:30:15.512692676 +0900 +=================================--- linux-3.6.orig/arch/sparc/mm/init_64.c 2012-10-04 18:30:15.512692676 +0900 +++ linux-3.6/arch/sparc/mm/init_64.c 2012-10-04 18:30:21.163698408 +0900 @@ -2078,6 +2078,14 @@ void __meminit vmemmap_populate_print_la } @@ -111,8 +107,7 @@ Index: linux-3.6/arch/sparc/mm/init_64.c struct page *start_page, unsigned long size) { 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:15.517692681 +0900 +=================================--- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 18:30:15.517692681 +0900 +++ linux-3.6/arch/x86/mm/init_64.c 2012-10-04 18:30:21.171698416 +0900 @@ -993,6 +993,125 @@ vmemmap_populate(struct page *start_page return 0; @@ -231,7 +226,7 @@ Index: linux-3.6/arch/x86/mm/init_64.c + continue; + + magic = (unsigned long) page->lru.next; -+ if (magic == SECTION_INFO) ++ if (magic = SECTION_INFO) + put_page_bootmem(page); + flush_tlb_kernel_range(addr, end); + } @@ -241,8 +236,7 @@ Index: linux-3.6/arch/x86/mm/init_64.c struct page *start_page, unsigned long size) { Index: linux-3.6/include/linux/mm.h -=================================================================== ---- linux-3.6.orig/include/linux/mm.h 2012-10-04 18:30:15.524692688 +0900 +=================================--- linux-3.6.orig/include/linux/mm.h 2012-10-04 18:30:15.524692688 +0900 +++ linux-3.6/include/linux/mm.h 2012-10-04 18:30:21.177698422 +0900 @@ -1620,6 +1620,8 @@ int vmemmap_populate(struct page *start_ void vmemmap_populate_print_last(void); @@ -254,8 +248,7 @@ Index: linux-3.6/include/linux/mm.h enum mf_flags { MF_COUNT_INCREASED = 1 << 0, Index: linux-3.6/mm/memory_hotplug.c -=================================================================== ---- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:30:15.464692627 +0900 +=================================--- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:30:15.464692627 +0900 +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 18:30:21.182698427 +0900 @@ -312,19 +312,6 @@ static int __meminit __add_section(int n return register_new_memory(nid, __pfn_to_section(phys_start_pfn)); @@ -290,8 +283,7 @@ Index: linux-3.6/mm/memory_hotplug.c /* * Reasonably generic function for adding memory. It is Index: linux-3.6/mm/sparse.c -=================================================================== ---- linux-3.6.orig/mm/sparse.c 2012-10-04 18:26:53.908488966 +0900 +=================================--- linux-3.6.orig/mm/sparse.c 2012-10-04 18:26:53.908488966 +0900 +++ linux-3.6/mm/sparse.c 2012-10-04 18:30:21.185698430 +0900 @@ -613,12 +613,13 @@ static inline struct page *kmalloc_secti /* This will make the necessary allocations eventually. */ diff --git a/a/content_digest b/N1/content_digest index feaa694..c49cbb7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0506E43E0.70507@jp.fujitsu.com\0" "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 7/10] memory-hotplug : remove memmap of sparse-vmemmap\0" - "Date\0Fri, 5 Oct 2012 11:34:41 +0900\0" + "Date\0Fri, 05 Oct 2012 02:34:41 +0000\0" "To\0x86@kernel.org" linux-mm@kvack.org linux-kernel@vger.kernel.org @@ -60,8 +60,7 @@ " 8 files changed, 158 insertions(+), 17 deletions(-)\n" "\n" "Index: linux-3.6/arch/ia64/mm/discontig.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/ia64/mm/discontig.c\t2012-10-04 18:30:15.475692638 +0900\n" + "=================================--- linux-3.6.orig/arch/ia64/mm/discontig.c\t2012-10-04 18:30:15.475692638 +0900\n" "+++ linux-3.6/arch/ia64/mm/discontig.c\t2012-10-04 18:30:21.145698389 +0900\n" "@@ -823,6 +823,14 @@ int __meminit vmemmap_populate(struct pa\n" " \treturn vmemmap_populate_basepages(start_page, size, node);\n" @@ -79,8 +78,7 @@ " \t\t\t\t struct page *start_page, unsigned long size)\n" " {\n" "Index: linux-3.6/arch/powerpc/mm/init_64.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/powerpc/mm/init_64.c\t2012-10-04 18:30:15.494692657 +0900\n" + "=================================--- linux-3.6.orig/arch/powerpc/mm/init_64.c\t2012-10-04 18:30:15.494692657 +0900\n" "+++ linux-3.6/arch/powerpc/mm/init_64.c\t2012-10-04 18:30:21.150698394 +0900\n" "@@ -299,6 +299,14 @@ int __meminit vmemmap_populate(struct pa\n" " \treturn 0;\n" @@ -98,8 +96,7 @@ " \t\t\t\t struct page *start_page, unsigned long size)\n" " {\n" "Index: linux-3.6/arch/s390/mm/vmem.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/s390/mm/vmem.c\t2012-10-04 18:30:15.506692670 +0900\n" + "=================================--- linux-3.6.orig/arch/s390/mm/vmem.c\t2012-10-04 18:30:15.506692670 +0900\n" "+++ linux-3.6/arch/s390/mm/vmem.c\t2012-10-04 18:30:21.157698401 +0900\n" "@@ -227,6 +227,14 @@ out:\n" " \treturn ret;\n" @@ -117,8 +114,7 @@ " \t\t\t\t struct page *start_page, unsigned long size)\n" " {\n" "Index: linux-3.6/arch/sparc/mm/init_64.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/sparc/mm/init_64.c\t2012-10-04 18:30:15.512692676 +0900\n" + "=================================--- linux-3.6.orig/arch/sparc/mm/init_64.c\t2012-10-04 18:30:15.512692676 +0900\n" "+++ linux-3.6/arch/sparc/mm/init_64.c\t2012-10-04 18:30:21.163698408 +0900\n" "@@ -2078,6 +2078,14 @@ void __meminit vmemmap_populate_print_la\n" " \t}\n" @@ -136,8 +132,7 @@ " \t\t\t\t struct page *start_page, unsigned long size)\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:15.517692681 +0900\n" + "=================================--- linux-3.6.orig/arch/x86/mm/init_64.c\t2012-10-04 18:30:15.517692681 +0900\n" "+++ linux-3.6/arch/x86/mm/init_64.c\t2012-10-04 18:30:21.171698416 +0900\n" "@@ -993,6 +993,125 @@ vmemmap_populate(struct page *start_page\n" " \treturn 0;\n" @@ -256,7 +251,7 @@ "+\t\t\tcontinue;\n" "+\n" "+\t\tmagic = (unsigned long) page->lru.next;\n" - "+\t\tif (magic == SECTION_INFO)\n" + "+\t\tif (magic = SECTION_INFO)\n" "+\t\t\tput_page_bootmem(page);\n" "+\t\tflush_tlb_kernel_range(addr, end);\n" "+\t}\n" @@ -266,8 +261,7 @@ " \t\t\t\t struct page *start_page, unsigned long size)\n" " {\n" "Index: linux-3.6/include/linux/mm.h\n" - "===================================================================\n" - "--- linux-3.6.orig/include/linux/mm.h\t2012-10-04 18:30:15.524692688 +0900\n" + "=================================--- linux-3.6.orig/include/linux/mm.h\t2012-10-04 18:30:15.524692688 +0900\n" "+++ linux-3.6/include/linux/mm.h\t2012-10-04 18:30:21.177698422 +0900\n" "@@ -1620,6 +1620,8 @@ int vmemmap_populate(struct page *start_\n" " void vmemmap_populate_print_last(void);\n" @@ -279,8 +273,7 @@ " enum mf_flags {\n" " \tMF_COUNT_INCREASED = 1 << 0,\n" "Index: linux-3.6/mm/memory_hotplug.c\n" - "===================================================================\n" - "--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:30:15.464692627 +0900\n" + "=================================--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:30:15.464692627 +0900\n" "+++ linux-3.6/mm/memory_hotplug.c\t2012-10-04 18:30:21.182698427 +0900\n" "@@ -312,19 +312,6 @@ static int __meminit __add_section(int n\n" " \treturn register_new_memory(nid, __pfn_to_section(phys_start_pfn));\n" @@ -315,8 +308,7 @@ " /*\n" " * Reasonably generic function for adding memory. It is\n" "Index: linux-3.6/mm/sparse.c\n" - "===================================================================\n" - "--- linux-3.6.orig/mm/sparse.c\t2012-10-04 18:26:53.908488966 +0900\n" + "=================================--- linux-3.6.orig/mm/sparse.c\t2012-10-04 18:26:53.908488966 +0900\n" "+++ linux-3.6/mm/sparse.c\t2012-10-04 18:30:21.185698430 +0900\n" "@@ -613,12 +613,13 @@ static inline struct page *kmalloc_secti\n" " \t/* This will make the necessary allocations eventually. */\n" @@ -335,4 +327,4 @@ " #else\n" static struct page *__kmalloc_section_memmap(unsigned long nr_pages) -c06c8faf2599943ca62eaeeec680d4ed93f825b7374deaa103507466593c88da +19e244234401ce7f281eec804b0590c52b267e1ad5ccf1ce7b0af53aa1fc6f28
diff --git a/a/content_digest b/N2/content_digest index feaa694..746dc55 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,25 +2,25 @@ "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 7/10] memory-hotplug : remove memmap of sparse-vmemmap\0" "Date\0Fri, 5 Oct 2012 11:34:41 +0900\0" - "To\0x86@kernel.org" - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org - linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org - cmetcalf@tilera.com - " sparclinux@vger.kernel.org\0" - "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" + "To\0<x86@kernel.org>" + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> + <linux-acpi@vger.kernel.org> + <linux-s390@vger.kernel.org> + <linux-sh@vger.kernel.org> + <linux-ia64@vger.kernel.org> + <cmetcalf@tilera.com> + " <sparclinux@vger.kernel.org>\0" + "Cc\0len.brown@intel.com" + wency@cn.fujitsu.com + Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> + minchan.kim@gmail.com + kosaki.motohiro@jp.fujitsu.com rientjes@google.com - liuj97@gmail.com - len.brown@intel.com cl@linux.com - minchan.kim@gmail.com akpm@linux-foundation.org - kosaki.motohiro@jp.fujitsu.com - " wency@cn.fujitsu.com\0" + " liuj97@gmail.com\0" "\00:1\0" "b\0" "All pages of virtual mapping in removed memory cannot be freed, since some pages\n" @@ -335,4 +335,4 @@ " #else\n" static struct page *__kmalloc_section_memmap(unsigned long nr_pages) -c06c8faf2599943ca62eaeeec680d4ed93f825b7374deaa103507466593c88da +beb039051ae5d3a5efd832fc30ccfcdc702f7f22494cf6fec1fd2b56d5f183e8
diff --git a/a/1.txt b/N3/1.txt index 6b07d43..40d0017 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -309,3 +309,9 @@ Index: linux-3.6/mm/sparse.c } #else static struct page *__kmalloc_section_memmap(unsigned long nr_pages) + +-- +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 feaa694..ec35375 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -333,6 +333,12 @@ "+\tvmemmap_free_bootmem(page, nr_pages);\n" " }\n" " #else\n" - static struct page *__kmalloc_section_memmap(unsigned long nr_pages) + " static struct page *__kmalloc_section_memmap(unsigned long nr_pages)\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>" -c06c8faf2599943ca62eaeeec680d4ed93f825b7374deaa103507466593c88da +e214964d79708a73752b61a922beac188ace1b841f74c7085aba3d86b8f1f5bf
diff --git a/a/content_digest b/N4/content_digest index feaa694..0f92941 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -2,25 +2,25 @@ "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 7/10] memory-hotplug : remove memmap of sparse-vmemmap\0" "Date\0Fri, 5 Oct 2012 11:34:41 +0900\0" - "To\0x86@kernel.org" - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org - linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org - cmetcalf@tilera.com - " sparclinux@vger.kernel.org\0" + "To\0<x86@kernel.org>" + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> + <linux-acpi@vger.kernel.org> + <linux-s390@vger.kernel.org> + <linux-sh@vger.kernel.org> + <linux-ia64@vger.kernel.org> + <cmetcalf@tilera.com> + " <sparclinux@vger.kernel.org>\0" "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" - rientjes@google.com - liuj97@gmail.com - len.brown@intel.com - cl@linux.com - minchan.kim@gmail.com - akpm@linux-foundation.org - kosaki.motohiro@jp.fujitsu.com - " wency@cn.fujitsu.com\0" + <rientjes@google.com> + <liuj97@gmail.com> + <len.brown@intel.com> + <cl@linux.com> + <minchan.kim@gmail.com> + <akpm@linux-foundation.org> + <kosaki.motohiro@jp.fujitsu.com> + " <wency@cn.fujitsu.com>\0" "\00:1\0" "b\0" "All pages of virtual mapping in removed memory cannot be freed, since some pages\n" @@ -335,4 +335,4 @@ " #else\n" static struct page *__kmalloc_section_memmap(unsigned long nr_pages) -c06c8faf2599943ca62eaeeec680d4ed93f825b7374deaa103507466593c88da +a7d26771b54807db7c1e082ea3e969cb121af9fa777dab3bd3ee5bc0a886f3af
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.