diff for duplicates of <50AB4EE6.1080609@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 18422e7..fc6e367 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,7 +100,7 @@ Wen Congyang >> + 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. @@ -191,8 +191,7 @@ Wen Congyang > 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 > { @@ -218,8 +217,7 @@ Wen Congyang > 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); @@ -231,8 +229,7 @@ Wen Congyang > 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> @@ -253,7 +250,7 @@ Wen Congyang > + 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 5a1e4c7..9f326b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\050AA0537.1000501@jp.fujitsu.com\0" "From\0Wen Congyang <wency@cn.fujitsu.com>\0" "Subject\0Re: [PATCH v3 11/12] memory-hotplug: remove sysfs file of node\0" - "Date\0Tue, 20 Nov 2012 17:35:34 +0800\0" + "Date\0Tue, 20 Nov 2012 09:35:34 +0000\0" "To\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Cc\0x86@kernel.org" linux-mm@kvack.org @@ -129,7 +129,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" @@ -220,8 +220,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" @@ -247,8 +246,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" @@ -260,8 +258,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" @@ -282,7 +279,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" @@ -352,4 +349,4 @@ "> \n" > -6fe93fbc33c67052823d43caa0b0c04a654d9a5d75d5eac89880177d80ec03cd +1bc1e43ed1f4d2eb150f9e218b05ad07ef1348fe9b97bf6d49d9618ece97fe29
diff --git a/a/content_digest b/N2/content_digest index 5a1e4c7..eddb59c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,26 +5,25 @@ "Subject\0Re: [PATCH v3 11/12] memory-hotplug: remove sysfs file of node\0" "Date\0Tue, 20 Nov 2012 17:35:34 +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" + 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" "At 11/19/2012 06:08 PM, Yasuaki Ishimatsu Wrote:\n" @@ -352,4 +351,4 @@ "> \n" > -6fe93fbc33c67052823d43caa0b0c04a654d9a5d75d5eac89880177d80ec03cd +8c1434b3264a5e98de4b87244039497541f9eeb7b150b9af03b63186b963f2c6
diff --git a/a/1.txt b/N3/1.txt index 18422e7..f67b8e5 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -321,4 +321,10 @@ Wen Congyang > 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 5a1e4c7..39d2669 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -350,6 +350,12 @@ "> \treturn -EINVAL;\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>" -6fe93fbc33c67052823d43caa0b0c04a654d9a5d75d5eac89880177d80ec03cd +7901a954d291351bbe28e43c88d72c12af5bf683aac79b78b566a801e551f2b9
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.