diff for duplicates of <506E47DA.7040404@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index fb090a5..a4631ae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,8 +18,7 @@ Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> 1 file changed, 207 insertions(+) Index: linux-3.6/mm/memory_hotplug.c -=================================================================== ---- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:30:21.182698427 +0900 +=================================--- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:30:21.182698427 +0900 +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 18:30:31.767709165 +0900 @@ -312,10 +312,213 @@ static int __meminit __add_section(int n return register_new_memory(nid, __pfn_to_section(phys_start_pfn)); @@ -88,7 +87,7 @@ Index: linux-3.6/mm/memory_hotplug.c + int nid = zone_to_nid(zone); + + zone_span_writelock(zone); -+ if (zone_start_pfn == start_pfn) { ++ if (zone_start_pfn = start_pfn) { + /* + * If the section is smallest section in the zone, it need + * shrink zone->zone_start_pfn and zone->zone_spanned_pages. @@ -101,7 +100,7 @@ Index: linux-3.6/mm/memory_hotplug.c + zone->zone_start_pfn = pfn; + zone->spanned_pages = zone_end_pfn - pfn; + } -+ } else if (zone_end_pfn == end_pfn) { ++ } else if (zone_end_pfn = end_pfn) { + /* + * If the section is biggest section in the zone, it need + * shrink zone->spanned_pages. @@ -131,7 +130,7 @@ Index: linux-3.6/mm/memory_hotplug.c + continue; + + /* If the section is current section, it continues the loop */ -+ if (start_pfn == pfn) ++ if (start_pfn = pfn) + continue; + + /* If we find valid section, we have nothing to do */ @@ -149,13 +148,12 @@ Index: linux-3.6/mm/memory_hotplug.c + unsigned long start_pfn, unsigned long end_pfn) +{ + unsigned long pgdat_start_pfn = pgdat->node_start_pfn; -+ unsigned long pgdat_end_pfn = -+ pgdat->node_start_pfn + pgdat->node_spanned_pages; ++ unsigned long pgdat_end_pfn + pgdat->node_start_pfn + pgdat->node_spanned_pages; + unsigned long pfn; + struct mem_section *ms; + int nid = pgdat->node_id; + -+ if (pgdat_start_pfn == start_pfn) { ++ if (pgdat_start_pfn = start_pfn) { + /* + * If the section is smallest section in the pgdat, it need + * shrink pgdat->node_start_pfn and pgdat->node_spanned_pages. @@ -168,7 +166,7 @@ Index: linux-3.6/mm/memory_hotplug.c + pgdat->node_start_pfn = pfn; + pgdat->node_spanned_pages = pgdat_end_pfn - pfn; + } -+ } else if (pgdat_end_pfn == end_pfn) { ++ } else if (pgdat_end_pfn = end_pfn) { + /* + * If the section is biggest section in the pgdat, it need + * shrink pgdat->node_spanned_pages. @@ -199,7 +197,7 @@ Index: linux-3.6/mm/memory_hotplug.c + continue; + + /* If the section is current section, it continues the loop */ -+ if (start_pfn == pfn) ++ if (start_pfn = pfn) + continue; + + /* If we find valid section, we have nothing to do */ @@ -246,9 +244,3 @@ Index: linux-3.6/mm/memory_hotplug.c pgdat_resize_lock(pgdat, &flags); sparse_remove_one_section(zone, ms); pgdat_resize_unlock(pgdat, &flags); - --- -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/N1/content_digest index 316f90f..dd88c3d 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 9/10] memory-hotplug : memory_hotplug: clear zone when removing the memory\0" - "Date\0Fri, 5 Oct 2012 11:37:14 +0900\0" + "Date\0Fri, 05 Oct 2012 02:37:14 +0000\0" "To\0x86@kernel.org" linux-mm@kvack.org linux-kernel@vger.kernel.org @@ -43,8 +43,7 @@ " 1 file changed, 207 insertions(+)\n" "\n" "Index: linux-3.6/mm/memory_hotplug.c\n" - "===================================================================\n" - "--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:30:21.182698427 +0900\n" + "=================================--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:30:21.182698427 +0900\n" "+++ linux-3.6/mm/memory_hotplug.c\t2012-10-04 18:30:31.767709165 +0900\n" "@@ -312,10 +312,213 @@ static int __meminit __add_section(int n\n" " \treturn register_new_memory(nid, __pfn_to_section(phys_start_pfn));\n" @@ -113,7 +112,7 @@ "+\tint nid = zone_to_nid(zone);\n" "+\n" "+\tzone_span_writelock(zone);\n" - "+\tif (zone_start_pfn == start_pfn) {\n" + "+\tif (zone_start_pfn = start_pfn) {\n" "+\t\t/*\n" "+\t\t * If the section is smallest section in the zone, it need\n" "+\t\t * shrink zone->zone_start_pfn and zone->zone_spanned_pages.\n" @@ -126,7 +125,7 @@ "+\t\t\tzone->zone_start_pfn = pfn;\n" "+\t\t\tzone->spanned_pages = zone_end_pfn - pfn;\n" "+\t\t}\n" - "+\t} else if (zone_end_pfn == end_pfn) {\n" + "+\t} else if (zone_end_pfn = end_pfn) {\n" "+\t\t/*\n" "+\t\t * If the section is biggest section in the zone, it need\n" "+\t\t * shrink zone->spanned_pages.\n" @@ -156,7 +155,7 @@ "+\t\t\tcontinue;\n" "+\n" "+\t\t /* If the section is current section, it continues the loop */\n" - "+\t\tif (start_pfn == pfn)\n" + "+\t\tif (start_pfn = pfn)\n" "+\t\t\tcontinue;\n" "+\n" "+\t\t/* If we find valid section, we have nothing to do */\n" @@ -174,13 +173,12 @@ "+\t\t\t unsigned long start_pfn, unsigned long end_pfn)\n" "+{\n" "+\tunsigned long pgdat_start_pfn = pgdat->node_start_pfn;\n" - "+\tunsigned long pgdat_end_pfn =\n" - "+\t\tpgdat->node_start_pfn + pgdat->node_spanned_pages;\n" + "+\tunsigned long pgdat_end_pfn +\t\tpgdat->node_start_pfn + pgdat->node_spanned_pages;\n" "+\tunsigned long pfn;\n" "+\tstruct mem_section *ms;\n" "+\tint nid = pgdat->node_id;\n" "+\n" - "+\tif (pgdat_start_pfn == start_pfn) {\n" + "+\tif (pgdat_start_pfn = start_pfn) {\n" "+\t\t/*\n" "+\t\t * If the section is smallest section in the pgdat, it need\n" "+\t\t * shrink pgdat->node_start_pfn and pgdat->node_spanned_pages.\n" @@ -193,7 +191,7 @@ "+\t\t\tpgdat->node_start_pfn = pfn;\n" "+\t\t\tpgdat->node_spanned_pages = pgdat_end_pfn - pfn;\n" "+\t\t}\n" - "+\t} else if (pgdat_end_pfn == end_pfn) {\n" + "+\t} else if (pgdat_end_pfn = end_pfn) {\n" "+\t\t/*\n" "+\t\t * If the section is biggest section in the pgdat, it need\n" "+\t\t * shrink pgdat->node_spanned_pages.\n" @@ -224,7 +222,7 @@ "+\t\t\tcontinue;\n" "+\n" "+\t\t /* If the section is current section, it continues the loop */\n" - "+\t\tif (start_pfn == pfn)\n" + "+\t\tif (start_pfn = pfn)\n" "+\t\t\tcontinue;\n" "+\n" "+\t\t/* If we find valid section, we have nothing to do */\n" @@ -270,12 +268,6 @@ "+\n" " \tpgdat_resize_lock(pgdat, &flags);\n" " \tsparse_remove_one_section(zone, ms);\n" - " \tpgdat_resize_unlock(pgdat, &flags);\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>" + " \tpgdat_resize_unlock(pgdat, &flags);" -fbccfc0db641f53ac8cf7e1dd96d7a32e2349f6c72e12a6b542913b6f2237f9a +28e648c88b241a89ed67635dc472b7e4f7171c33a2cdb35bd06ff39281ec6ce0
diff --git a/a/1.txt b/N2/1.txt index fb090a5..a7a3e71 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -246,9 +246,3 @@ Index: linux-3.6/mm/memory_hotplug.c pgdat_resize_lock(pgdat, &flags); sparse_remove_one_section(zone, ms); pgdat_resize_unlock(pgdat, &flags); - --- -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/N2/content_digest index 316f90f..cc9e182 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 9/10] memory-hotplug : memory_hotplug: clear zone when removing the memory\0" "Date\0Fri, 5 Oct 2012 11:37:14 +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" "When a memory is added, we update zone's and pgdat's start_pfn and\n" @@ -270,12 +270,6 @@ "+\n" " \tpgdat_resize_lock(pgdat, &flags);\n" " \tsparse_remove_one_section(zone, ms);\n" - " \tpgdat_resize_unlock(pgdat, &flags);\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>" + " \tpgdat_resize_unlock(pgdat, &flags);" -fbccfc0db641f53ac8cf7e1dd96d7a32e2349f6c72e12a6b542913b6f2237f9a +a5b1b4f436e4e77ef7dafba6054b301b4e43dcad53bec453eb7167b9fe8e8afd
diff --git a/a/1.txt b/N3/1.txt index fb090a5..a7a3e71 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -246,9 +246,3 @@ Index: linux-3.6/mm/memory_hotplug.c pgdat_resize_lock(pgdat, &flags); sparse_remove_one_section(zone, ms); pgdat_resize_unlock(pgdat, &flags); - --- -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 316f90f..81bd74f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,25 +2,25 @@ "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 9/10] memory-hotplug : memory_hotplug: clear zone when removing the memory\0" "Date\0Fri, 5 Oct 2012 11:37:14 +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" "When a memory is added, we update zone's and pgdat's start_pfn and\n" @@ -270,12 +270,6 @@ "+\n" " \tpgdat_resize_lock(pgdat, &flags);\n" " \tsparse_remove_one_section(zone, ms);\n" - " \tpgdat_resize_unlock(pgdat, &flags);\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>" + " \tpgdat_resize_unlock(pgdat, &flags);" -fbccfc0db641f53ac8cf7e1dd96d7a32e2349f6c72e12a6b542913b6f2237f9a +4378bb94390b1e6bbeb04c9f24cfebb5043fa43a7c0c8e418f9544f61bc35d4b
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.