diff for duplicates of <20100713101702.2835.19139.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 1ae3b2d..0a01a76 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,9 +69,3 @@ index 50a6d10..ebf0af7 100644 return 0; -- 1.7.1.1 - --- -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 fdfd094..4de47dc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -86,12 +86,6 @@ " \tsetup_per_zone_inactive_ratio();\n" " \treturn 0;\n" "-- \n" - "1.7.1.1\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>" + 1.7.1.1 -8a121c9b90f4f4036a3931505f52c1e62d9eb5f064ac1cd85681cc81980088bc +c61f53b02288f61275223b368712b0851acf90990d164054475c2d36981173a7
diff --git a/a/1.txt b/N2/1.txt index 1ae3b2d..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,77 +1 @@ ->From bc55bacd6bcc0f8a69c0d7e0d554c78237233e07 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Mon, 12 Jul 2010 17:58:34 +0800 -Subject: [PATCH 01/30] mm: serialize access to min_free_kbytes -There is a small race between the procfs caller and the memory hotplug caller -of setup_per_zone_wmarks(). Not a big deal, but the next patch will add yet -another caller. Time to close the gap. - -Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> -Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> -Signed-off-by: Xiaotian Feng <dfeng@redhat.com> ---- - mm/page_alloc.c | 16 +++++++++++++--- - 1 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 50a6d10..ebf0af7 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -165,6 +165,7 @@ static char * const zone_names[MAX_NR_ZONES] = { - "Movable", - }; - -+static DEFINE_SPINLOCK(min_free_lock); - int min_free_kbytes = 1024; - - static unsigned long __meminitdata nr_kernel_pages; -@@ -4839,13 +4840,13 @@ static void setup_per_zone_lowmem_reserve(void) - } - - /** -- * setup_per_zone_wmarks - called when min_free_kbytes changes -+ * __setup_per_zone_wmarks - called when min_free_kbytes changes - * or when memory is hot-{added|removed} - * - * Ensures that the watermark[min,low,high] values for each zone are set - * correctly with respect to min_free_kbytes. - */ --void setup_per_zone_wmarks(void) -+static void __setup_per_zone_wmarks(void) - { - unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10); - unsigned long lowmem_pages = 0; -@@ -4943,6 +4944,15 @@ static void __init setup_per_zone_inactive_ratio(void) - calculate_zone_inactive_ratio(zone); - } - -+void setup_per_zone_wmarks(void) -+{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&min_free_lock, flags); -+ __setup_per_zone_wmarks(); -+ spin_unlock_irqrestore(&min_free_lock, flags); -+} -+ - /* - * Initialise min_free_kbytes. - * -@@ -4978,7 +4988,7 @@ static int __init init_per_zone_wmark_min(void) - min_free_kbytes = 128; - if (min_free_kbytes > 65536) - min_free_kbytes = 65536; -- setup_per_zone_wmarks(); -+ __setup_per_zone_wmarks(); - setup_per_zone_lowmem_reserve(); - setup_per_zone_inactive_ratio(); - return 0; --- -1.7.1.1 - --- -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 fdfd094..5f343f4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,82 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From bc55bacd6bcc0f8a69c0d7e0d554c78237233e07 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Mon, 12 Jul 2010 17:58:34 +0800\n" - "Subject: [PATCH 01/30] mm: serialize access to min_free_kbytes\n" - "\n" - "There is a small race between the procfs caller and the memory hotplug caller\n" - "of setup_per_zone_wmarks(). Not a big deal, but the next patch will add yet\n" - "another caller. Time to close the gap.\n" - "\n" - "Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>\n" - "Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>\n" - "Signed-off-by: Xiaotian Feng <dfeng@redhat.com>\n" - "---\n" - " mm/page_alloc.c | 16 +++++++++++++---\n" - " 1 files changed, 13 insertions(+), 3 deletions(-)\n" - "\n" - "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n" - "index 50a6d10..ebf0af7 100644\n" - "--- a/mm/page_alloc.c\n" - "+++ b/mm/page_alloc.c\n" - "@@ -165,6 +165,7 @@ static char * const zone_names[MAX_NR_ZONES] = {\n" - " \t \"Movable\",\n" - " };\n" - " \n" - "+static DEFINE_SPINLOCK(min_free_lock);\n" - " int min_free_kbytes = 1024;\n" - " \n" - " static unsigned long __meminitdata nr_kernel_pages;\n" - "@@ -4839,13 +4840,13 @@ static void setup_per_zone_lowmem_reserve(void)\n" - " }\n" - " \n" - " /**\n" - "- * setup_per_zone_wmarks - called when min_free_kbytes changes\n" - "+ * __setup_per_zone_wmarks - called when min_free_kbytes changes\n" - " * or when memory is hot-{added|removed}\n" - " *\n" - " * Ensures that the watermark[min,low,high] values for each zone are set\n" - " * correctly with respect to min_free_kbytes.\n" - " */\n" - "-void setup_per_zone_wmarks(void)\n" - "+static void __setup_per_zone_wmarks(void)\n" - " {\n" - " \tunsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10);\n" - " \tunsigned long lowmem_pages = 0;\n" - "@@ -4943,6 +4944,15 @@ static void __init setup_per_zone_inactive_ratio(void)\n" - " \t\tcalculate_zone_inactive_ratio(zone);\n" - " }\n" - " \n" - "+void setup_per_zone_wmarks(void)\n" - "+{\n" - "+\tunsigned long flags;\n" - "+\n" - "+\tspin_lock_irqsave(&min_free_lock, flags);\n" - "+\t__setup_per_zone_wmarks();\n" - "+\tspin_unlock_irqrestore(&min_free_lock, flags);\n" - "+}\n" - "+\n" - " /*\n" - " * Initialise min_free_kbytes.\n" - " *\n" - "@@ -4978,7 +4988,7 @@ static int __init init_per_zone_wmark_min(void)\n" - " \t\tmin_free_kbytes = 128;\n" - " \tif (min_free_kbytes > 65536)\n" - " \t\tmin_free_kbytes = 65536;\n" - "-\tsetup_per_zone_wmarks();\n" - "+\t__setup_per_zone_wmarks();\n" - " \tsetup_per_zone_lowmem_reserve();\n" - " \tsetup_per_zone_inactive_ratio();\n" - " \treturn 0;\n" - "-- \n" - "1.7.1.1\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>" -8a121c9b90f4f4036a3931505f52c1e62d9eb5f064ac1cd85681cc81980088bc +210c239af82e732259dcaf124395f8bae9f98fce89052469bdbf2aba2bc912f1
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.