diff for duplicates of <50AA0537.1000501@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index dfa44b4..0b4eb9c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -92,7 +92,7 @@ I updated the patch and attached it on the mail. > + int cpu; > + > + for_each_present_cpu(cpu) { -> + if (cpu_to_node(cpu) == pgdat->node_id) +> + if (cpu_to_node(cpu) = pgdat->node_id) > + /* > + * the cpu on this node isn't removed, and we can't > + * offline this node. @@ -183,8 +183,7 @@ Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> 3 files changed, 65 insertions(+), 4 deletions(-) Index: linux-3.7-rc6/drivers/acpi/acpi_memhotplug.c -=================================================================== ---- linux-3.7-rc6.orig/drivers/acpi/acpi_memhotplug.c 2012-11-19 16:16:55.161912688 +0900 +=================================--- linux-3.7-rc6.orig/drivers/acpi/acpi_memhotplug.c 2012-11-19 16:16:55.161912688 +0900 +++ linux-3.7-rc6/drivers/acpi/acpi_memhotplug.c 2012-11-19 16:17:05.346912109 +0900 @@ -295,6 +295,9 @@ static int acpi_memory_remove_memory(str { @@ -210,8 +209,7 @@ Index: linux-3.7-rc6/drivers/acpi/acpi_memhotplug.c return result; Index: linux-3.7-rc6/include/linux/memory_hotplug.h -=================================================================== ---- linux-3.7-rc6.orig/include/linux/memory_hotplug.h 2012-11-19 16:16:55.167912687 +0900 +=================================--- linux-3.7-rc6.orig/include/linux/memory_hotplug.h 2012-11-19 16:16:55.167912687 +0900 +++ linux-3.7-rc6/include/linux/memory_hotplug.h 2012-11-19 16:17:05.348912109 +0900 @@ -242,7 +242,7 @@ extern int arch_add_memory(int nid, u64 extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); @@ -223,8 +221,7 @@ Index: linux-3.7-rc6/include/linux/memory_hotplug.h int nr_pages); extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms); Index: linux-3.7-rc6/mm/memory_hotplug.c -=================================================================== ---- linux-3.7-rc6.orig/mm/memory_hotplug.c 2012-11-19 16:16:55.164912687 +0900 +=================================--- linux-3.7-rc6.orig/mm/memory_hotplug.c 2012-11-19 16:16:55.164912687 +0900 +++ linux-3.7-rc6/mm/memory_hotplug.c 2012-11-19 16:17:05.356912108 +0900 @@ -29,6 +29,7 @@ #include <linux/suspend.h> @@ -245,7 +242,7 @@ Index: linux-3.7-rc6/mm/memory_hotplug.c + int cpu; + + for_each_present_cpu(cpu) { -+ if (cpu_to_node(cpu) == pgdat->node_id) ++ if (cpu_to_node(cpu) = pgdat->node_id) + /* + * the cpu on this node isn't removed, and we can't + * offline this node. diff --git a/a/content_digest b/N1/content_digest index 8695e80..b45a956 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01351763083-7905-12-git-send-email-wency@cn.fujitsu.com\0" "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0Re: [PATCH v3 11/12] memory-hotplug: remove sysfs file of node\0" - "Date\0Mon, 19 Nov 2012 19:08:55 +0900\0" + "Date\0Mon, 19 Nov 2012 10:08:55 +0000\0" "To\0Wen Congyang <wency@cn.fujitsu.com>\0" "Cc\0x86@kernel.org" linux-mm@kvack.org @@ -120,7 +120,7 @@ "> +\tint cpu;\n" "> +\n" "> +\tfor_each_present_cpu(cpu) {\n" - "> +\t\tif (cpu_to_node(cpu) == pgdat->node_id)\n" + "> +\t\tif (cpu_to_node(cpu) = pgdat->node_id)\n" "> +\t\t\t/*\n" "> +\t\t\t * the cpu on this node isn't removed, and we can't\n" "> +\t\t\t * offline this node.\n" @@ -211,8 +211,7 @@ " 3 files changed, 65 insertions(+), 4 deletions(-)\n" "\n" "Index: linux-3.7-rc6/drivers/acpi/acpi_memhotplug.c\n" - "===================================================================\n" - "--- linux-3.7-rc6.orig/drivers/acpi/acpi_memhotplug.c\t2012-11-19 16:16:55.161912688 +0900\n" + "=================================--- linux-3.7-rc6.orig/drivers/acpi/acpi_memhotplug.c\t2012-11-19 16:16:55.161912688 +0900\n" "+++ linux-3.7-rc6/drivers/acpi/acpi_memhotplug.c\t2012-11-19 16:17:05.346912109 +0900\n" "@@ -295,6 +295,9 @@ static int acpi_memory_remove_memory(str\n" " {\n" @@ -238,8 +237,7 @@ " \t\t\treturn result;\n" " \n" "Index: linux-3.7-rc6/include/linux/memory_hotplug.h\n" - "===================================================================\n" - "--- linux-3.7-rc6.orig/include/linux/memory_hotplug.h\t2012-11-19 16:16:55.167912687 +0900\n" + "=================================--- linux-3.7-rc6.orig/include/linux/memory_hotplug.h\t2012-11-19 16:16:55.167912687 +0900\n" "+++ linux-3.7-rc6/include/linux/memory_hotplug.h\t2012-11-19 16:17:05.348912109 +0900\n" "@@ -242,7 +242,7 @@ extern int arch_add_memory(int nid, u64 \n" " extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);\n" @@ -251,8 +249,7 @@ " \t\t\t\t\t\t\t\tint nr_pages);\n" " extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms);\n" "Index: linux-3.7-rc6/mm/memory_hotplug.c\n" - "===================================================================\n" - "--- linux-3.7-rc6.orig/mm/memory_hotplug.c\t2012-11-19 16:16:55.164912687 +0900\n" + "=================================--- linux-3.7-rc6.orig/mm/memory_hotplug.c\t2012-11-19 16:16:55.164912687 +0900\n" "+++ linux-3.7-rc6/mm/memory_hotplug.c\t2012-11-19 16:17:05.356912108 +0900\n" "@@ -29,6 +29,7 @@\n" " #include <linux/suspend.h>\n" @@ -273,7 +270,7 @@ "+\tint cpu;\n" "+\n" "+\tfor_each_present_cpu(cpu) {\n" - "+\t\tif (cpu_to_node(cpu) == pgdat->node_id)\n" + "+\t\tif (cpu_to_node(cpu) = pgdat->node_id)\n" "+\t\t\t/*\n" "+\t\t\t * the cpu on this node isn't removed, and we can't\n" "+\t\t\t * offline this node.\n" @@ -341,4 +338,4 @@ " \treturn -EINVAL;\n" } -cdafbc0b1cf7f534f3f4f1e370f1c6ada74d55ed327194691b5bde78e27e95df +2a7f65b72b0e022f2ff2be11421411174892205fcf86415416f1f9be415c88f6
diff --git a/a/content_digest b/N2/content_digest index 8695e80..3055a45 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,26 +4,25 @@ "Subject\0Re: [PATCH v3 11/12] memory-hotplug: remove sysfs file of node\0" "Date\0Mon, 19 Nov 2012 19:08:55 +0900\0" "To\0Wen Congyang <wency@cn.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" + linux-ia64@vger.kernel.org + Len Brown <len.brown@intel.com> linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org + x86@kernel.org + linux-kernel@vger.kernel.org cmetcalf@tilera.com - sparclinux@vger.kernel.org - David Rientjes <rientjes@google.com> - Jiang Liu <liuj97@gmail.com> - Len Brown <len.brown@intel.com> - benh@kernel.crashing.org + Jianguo Wu <wujianguo@huawei.com> + linux-mm@kvack.org paulus@samba.org - Christoph Lameter <cl@linux.com> Minchan Kim <minchan.kim@gmail.com> - Andrew Morton <akpm@linux-foundation.org> KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> - " Jianguo Wu <wujianguo@huawei.com>\0" + David Rientjes <rientjes@google.com> + sparclinux@vger.kernel.org + Christoph Lameter <cl@linux.com> + linuxppc-dev@lists.ozlabs.org + Andrew Morton <akpm@linux-foundation.org> + " Jiang Liu <liuj97@gmail.com>\0" "\00:1\0" "b\0" "Hi Wen,\n" @@ -341,4 +340,4 @@ " \treturn -EINVAL;\n" } -cdafbc0b1cf7f534f3f4f1e370f1c6ada74d55ed327194691b5bde78e27e95df +333b1e5ba952509a750e79b522954058d0a3a73bbc454148c5e922abcef1a88f
diff --git a/a/1.txt b/N3/1.txt index dfa44b4..5edc51c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -312,3 +312,9 @@ Index: linux-3.7-rc6/mm/memory_hotplug.c { return -EINVAL; } + +-- +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 8695e80..204e2d5 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -339,6 +339,12 @@ "+int remove_memory(int nid, u64 start, u64 size)\n" " {\n" " \treturn -EINVAL;\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>" -cdafbc0b1cf7f534f3f4f1e370f1c6ada74d55ed327194691b5bde78e27e95df +c1853dcd46266f17ae1853f8c7b64c633e83d4fddb1b50fe4f104f5c9cb5f48b
diff --git a/a/content_digest b/N4/content_digest index 8695e80..8a82e6a 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -4,21 +4,21 @@ "Subject\0Re: [PATCH v3 11/12] memory-hotplug: remove sysfs file of node\0" "Date\0Mon, 19 Nov 2012 19:08:55 +0900\0" "To\0Wen Congyang <wency@cn.fujitsu.com>\0" - "Cc\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 + "Cc\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> David Rientjes <rientjes@google.com> Jiang Liu <liuj97@gmail.com> Len Brown <len.brown@intel.com> - benh@kernel.crashing.org - paulus@samba.org + <benh@kernel.crashing.org> + <paulus@samba.org> Christoph Lameter <cl@linux.com> Minchan Kim <minchan.kim@gmail.com> Andrew Morton <akpm@linux-foundation.org> @@ -341,4 +341,4 @@ " \treturn -EINVAL;\n" } -cdafbc0b1cf7f534f3f4f1e370f1c6ada74d55ed327194691b5bde78e27e95df +8e0f592d307a683cf0f304edd4136d9620cff8c4a4ccccb2b9fe821edcea6ea9
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.