diff for duplicates of <506E4616.10904@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 9b06eb4..e80d176 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,8 +31,7 @@ Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> 9 files changed, 96 insertions(+) Index: linux-3.6/arch/ia64/mm/init.c -=================================================================== ---- linux-3.6.orig/arch/ia64/mm/init.c 2012-10-04 18:27:03.082498276 +0900 +=================================--- linux-3.6.orig/arch/ia64/mm/init.c 2012-10-04 18:27:03.082498276 +0900 +++ linux-3.6/arch/ia64/mm/init.c 2012-10-04 18:28:50.087606867 +0900 @@ -688,6 +688,24 @@ int arch_add_memory(int nid, u64 start, @@ -60,8 +59,7 @@ Index: linux-3.6/arch/ia64/mm/init.c /* Index: linux-3.6/arch/powerpc/mm/mem.c -=================================================================== ---- linux-3.6.orig/arch/powerpc/mm/mem.c 2012-10-04 18:27:03.084498278 +0900 +=================================--- linux-3.6.orig/arch/powerpc/mm/mem.c 2012-10-04 18:27:03.084498278 +0900 +++ linux-3.6/arch/powerpc/mm/mem.c 2012-10-04 18:28:50.094606874 +0900 @@ -133,6 +133,18 @@ int arch_add_memory(int nid, u64 start, @@ -83,8 +81,7 @@ Index: linux-3.6/arch/powerpc/mm/mem.c /* Index: linux-3.6/arch/s390/mm/init.c -=================================================================== ---- linux-3.6.orig/arch/s390/mm/init.c 2012-10-04 18:27:03.080498274 +0900 +=================================--- linux-3.6.orig/arch/s390/mm/init.c 2012-10-04 18:27:03.080498274 +0900 +++ linux-3.6/arch/s390/mm/init.c 2012-10-04 18:28:50.104606884 +0900 @@ -257,4 +257,16 @@ int arch_add_memory(int nid, u64 start, vmem_remove_mapping(start, size); @@ -104,8 +101,7 @@ Index: linux-3.6/arch/s390/mm/init.c +#endif #endif /* CONFIG_MEMORY_HOTPLUG */ Index: linux-3.6/arch/sh/mm/init.c -=================================================================== ---- linux-3.6.orig/arch/sh/mm/init.c 2012-10-04 18:27:03.091498285 +0900 +=================================--- linux-3.6.orig/arch/sh/mm/init.c 2012-10-04 18:27:03.091498285 +0900 +++ linux-3.6/arch/sh/mm/init.c 2012-10-04 18:28:50.116606897 +0900 @@ -558,4 +558,21 @@ int memory_add_physaddr_to_nid(u64 addr) EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); @@ -122,7 +118,7 @@ Index: linux-3.6/arch/sh/mm/init.c + zone = page_zone(pfn_to_page(start_pfn)); + ret = __remove_pages(zone, start_pfn, nr_pages); + if (unlikely(ret)) -+ pr_warn("%s: Failed, __remove_pages() == %d\n", __func__, ++ pr_warn("%s: Failed, __remove_pages() = %d\n", __func__, + ret); + + return ret; @@ -130,8 +126,7 @@ Index: linux-3.6/arch/sh/mm/init.c +#endif #endif /* CONFIG_MEMORY_HOTPLUG */ Index: linux-3.6/arch/tile/mm/init.c -=================================================================== ---- linux-3.6.orig/arch/tile/mm/init.c 2012-10-04 18:27:03.078498272 +0900 +=================================--- linux-3.6.orig/arch/tile/mm/init.c 2012-10-04 18:27:03.078498272 +0900 +++ linux-3.6/arch/tile/mm/init.c 2012-10-04 18:28:50.122606903 +0900 @@ -935,6 +935,14 @@ int remove_memory(u64 start, u64 size) { @@ -149,8 +144,7 @@ Index: linux-3.6/arch/tile/mm/init.c struct kmem_cache *pgd_cache; Index: linux-3.6/arch/x86/mm/init_32.c -=================================================================== ---- linux-3.6.orig/arch/x86/mm/init_32.c 2012-10-04 18:27:03.089498283 +0900 +=================================--- linux-3.6.orig/arch/x86/mm/init_32.c 2012-10-04 18:27:03.089498283 +0900 +++ linux-3.6/arch/x86/mm/init_32.c 2012-10-04 18:28:50.128606909 +0900 @@ -842,6 +842,18 @@ int arch_add_memory(int nid, u64 start, @@ -172,8 +166,7 @@ Index: linux-3.6/arch/x86/mm/init_32.c /* Index: linux-3.6/arch/x86/mm/init_64.c -=================================================================== ---- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 18:27:03.086498280 +0900 +=================================--- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 18:27:03.086498280 +0900 +++ linux-3.6/arch/x86/mm/init_64.c 2012-10-04 18:28:50.132606913 +0900 @@ -675,6 +675,21 @@ int arch_add_memory(int nid, u64 start, } @@ -198,8 +191,7 @@ Index: linux-3.6/arch/x86/mm/init_64.c static struct kcore_list kcore_vsyscall; Index: linux-3.6/include/linux/memory_hotplug.h -=================================================================== ---- linux-3.6.orig/include/linux/memory_hotplug.h 2012-10-04 18:27:03.094498288 +0900 +=================================--- linux-3.6.orig/include/linux/memory_hotplug.h 2012-10-04 18:27:03.094498288 +0900 +++ linux-3.6/include/linux/memory_hotplug.h 2012-10-04 18:28:50.137606918 +0900 @@ -85,6 +85,7 @@ extern void __online_page_free(struct pa @@ -210,8 +202,7 @@ Index: linux-3.6/include/linux/memory_hotplug.h /* reasonably generic interface to expand the physical pages in a zone */ Index: linux-3.6/mm/memory_hotplug.c -=================================================================== ---- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:28:42.851599524 +0900 +=================================--- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:28:42.851599524 +0900 +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 18:29:50.577668254 +0900 @@ -1062,6 +1062,7 @@ int __ref remove_memory(int nid, u64 sta /* remove memmap entry */ diff --git a/a/content_digest b/N1/content_digest index 2f31017..8c4e46f 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 3/10] memory-hotplug : introduce new function arch_remove_memory() for removing page table depends on architecture\0" - "Date\0Fri, 5 Oct 2012 11:29:42 +0900\0" + "Subject\0[PATCH 3/10] memory-hotplug : introduce new function arch_remove_memory() for removing page table de\0" + "Date\0Fri, 05 Oct 2012 02:29:42 +0000\0" "To\0x86@kernel.org" linux-mm@kvack.org linux-kernel@vger.kernel.org @@ -56,8 +56,7 @@ " 9 files changed, 96 insertions(+)\n" "\n" "Index: linux-3.6/arch/ia64/mm/init.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/ia64/mm/init.c\t2012-10-04 18:27:03.082498276 +0900\n" + "=================================--- linux-3.6.orig/arch/ia64/mm/init.c\t2012-10-04 18:27:03.082498276 +0900\n" "+++ linux-3.6/arch/ia64/mm/init.c\t2012-10-04 18:28:50.087606867 +0900\n" "@@ -688,6 +688,24 @@ int arch_add_memory(int nid, u64 start, \n" " \n" @@ -85,8 +84,7 @@ " \n" " /*\n" "Index: linux-3.6/arch/powerpc/mm/mem.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/powerpc/mm/mem.c\t2012-10-04 18:27:03.084498278 +0900\n" + "=================================--- linux-3.6.orig/arch/powerpc/mm/mem.c\t2012-10-04 18:27:03.084498278 +0900\n" "+++ linux-3.6/arch/powerpc/mm/mem.c\t2012-10-04 18:28:50.094606874 +0900\n" "@@ -133,6 +133,18 @@ int arch_add_memory(int nid, u64 start, \n" " \n" @@ -108,8 +106,7 @@ " \n" " /*\n" "Index: linux-3.6/arch/s390/mm/init.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/s390/mm/init.c\t2012-10-04 18:27:03.080498274 +0900\n" + "=================================--- linux-3.6.orig/arch/s390/mm/init.c\t2012-10-04 18:27:03.080498274 +0900\n" "+++ linux-3.6/arch/s390/mm/init.c\t2012-10-04 18:28:50.104606884 +0900\n" "@@ -257,4 +257,16 @@ int arch_add_memory(int nid, u64 start, \n" " \t\tvmem_remove_mapping(start, size);\n" @@ -129,8 +126,7 @@ "+#endif\n" " #endif /* CONFIG_MEMORY_HOTPLUG */\n" "Index: linux-3.6/arch/sh/mm/init.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/sh/mm/init.c\t2012-10-04 18:27:03.091498285 +0900\n" + "=================================--- linux-3.6.orig/arch/sh/mm/init.c\t2012-10-04 18:27:03.091498285 +0900\n" "+++ linux-3.6/arch/sh/mm/init.c\t2012-10-04 18:28:50.116606897 +0900\n" "@@ -558,4 +558,21 @@ int memory_add_physaddr_to_nid(u64 addr)\n" " EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);\n" @@ -147,7 +143,7 @@ "+\tzone = page_zone(pfn_to_page(start_pfn));\n" "+\tret = __remove_pages(zone, start_pfn, nr_pages);\n" "+\tif (unlikely(ret))\n" - "+\t\tpr_warn(\"%s: Failed, __remove_pages() == %d\\n\", __func__,\n" + "+\t\tpr_warn(\"%s: Failed, __remove_pages() = %d\\n\", __func__,\n" "+\t\t\tret);\n" "+\n" "+\treturn ret;\n" @@ -155,8 +151,7 @@ "+#endif\n" " #endif /* CONFIG_MEMORY_HOTPLUG */\n" "Index: linux-3.6/arch/tile/mm/init.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/tile/mm/init.c\t2012-10-04 18:27:03.078498272 +0900\n" + "=================================--- linux-3.6.orig/arch/tile/mm/init.c\t2012-10-04 18:27:03.078498272 +0900\n" "+++ linux-3.6/arch/tile/mm/init.c\t2012-10-04 18:28:50.122606903 +0900\n" "@@ -935,6 +935,14 @@ int remove_memory(u64 start, u64 size)\n" " {\n" @@ -174,8 +169,7 @@ " \n" " struct kmem_cache *pgd_cache;\n" "Index: linux-3.6/arch/x86/mm/init_32.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/x86/mm/init_32.c\t2012-10-04 18:27:03.089498283 +0900\n" + "=================================--- linux-3.6.orig/arch/x86/mm/init_32.c\t2012-10-04 18:27:03.089498283 +0900\n" "+++ linux-3.6/arch/x86/mm/init_32.c\t2012-10-04 18:28:50.128606909 +0900\n" "@@ -842,6 +842,18 @@ int arch_add_memory(int nid, u64 start, \n" " \n" @@ -197,8 +191,7 @@ " \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:27:03.086498280 +0900\n" + "=================================--- linux-3.6.orig/arch/x86/mm/init_64.c\t2012-10-04 18:27:03.086498280 +0900\n" "+++ linux-3.6/arch/x86/mm/init_64.c\t2012-10-04 18:28:50.132606913 +0900\n" "@@ -675,6 +675,21 @@ int arch_add_memory(int nid, u64 start, \n" " }\n" @@ -223,8 +216,7 @@ " \n" " static struct kcore_list kcore_vsyscall;\n" "Index: linux-3.6/include/linux/memory_hotplug.h\n" - "===================================================================\n" - "--- linux-3.6.orig/include/linux/memory_hotplug.h\t2012-10-04 18:27:03.094498288 +0900\n" + "=================================--- linux-3.6.orig/include/linux/memory_hotplug.h\t2012-10-04 18:27:03.094498288 +0900\n" "+++ linux-3.6/include/linux/memory_hotplug.h\t2012-10-04 18:28:50.137606918 +0900\n" "@@ -85,6 +85,7 @@ extern void __online_page_free(struct pa\n" " \n" @@ -235,8 +227,7 @@ " \n" " /* reasonably generic interface to expand the physical pages in a zone */\n" "Index: linux-3.6/mm/memory_hotplug.c\n" - "===================================================================\n" - "--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:28:42.851599524 +0900\n" + "=================================--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:28:42.851599524 +0900\n" "+++ linux-3.6/mm/memory_hotplug.c\t2012-10-04 18:29:50.577668254 +0900\n" "@@ -1062,6 +1062,7 @@ int __ref remove_memory(int nid, u64 sta\n" " \t/* remove memmap entry */\n" @@ -247,4 +238,4 @@ " \tunlock_memory_hotplug();\n" " \treturn ret;" -7d6ef4d67be7fcfd47fe8e6bfad9b63eb8078c36b79b853f187cfa473af15ea3 +9821855ed7fcaf91ffbc059222a977630ee1c65b1bc5893704c66d17e7fe2d3c
diff --git a/a/content_digest b/N2/content_digest index 2f31017..d824004 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 3/10] memory-hotplug : introduce new function arch_remove_memory() for removing page table depends on architecture\0" "Date\0Fri, 5 Oct 2012 11:29:42 +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" "From: Wen Congyang <wency@cn.fujitsu.com>\n" @@ -247,4 +247,4 @@ " \tunlock_memory_hotplug();\n" " \treturn ret;" -7d6ef4d67be7fcfd47fe8e6bfad9b63eb8078c36b79b853f187cfa473af15ea3 +114e31fc575f53f04d23012ab9c99c50bc1243126a399d4655378b3be2e2f168
diff --git a/a/1.txt b/N3/1.txt index 9b06eb4..19924b4 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -221,3 +221,9 @@ Index: linux-3.6/mm/memory_hotplug.c out: unlock_memory_hotplug(); return ret; + +-- +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 2f31017..b9dceb6 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -245,6 +245,12 @@ "+\tarch_remove_memory(start, size);\n" " out:\n" " \tunlock_memory_hotplug();\n" - " \treturn ret;" + " \treturn ret;\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>" -7d6ef4d67be7fcfd47fe8e6bfad9b63eb8078c36b79b853f187cfa473af15ea3 +3d6968e28a6c851044aeb5bdda11fe7e7a2eda5a8a610badac10fe0cc4fc5489
diff --git a/a/content_digest b/N4/content_digest index 2f31017..2451634 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 3/10] memory-hotplug : introduce new function arch_remove_memory() for removing page table depends on architecture\0" "Date\0Fri, 5 Oct 2012 11:29:42 +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" "From: Wen Congyang <wency@cn.fujitsu.com>\n" @@ -247,4 +247,4 @@ " \tunlock_memory_hotplug();\n" " \treturn ret;" -7d6ef4d67be7fcfd47fe8e6bfad9b63eb8078c36b79b853f187cfa473af15ea3 +660d8c9aafd20b218c9697d1d55466716e8d93ebfb09c6511dad7befb4aa7e6e
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.