diff for duplicates of <20100713101736.2835.76110.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 3a0b781..b8db197 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,9 +49,3 @@ index 72a6be5..b9989c5 100644 zlc_mark_zone_full(zonelist, z); -- 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 2b88fc1..c539b97 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -66,12 +66,6 @@ " \t\tif (NUMA_BUILD)\n" " \t\t\tzlc_mark_zone_full(zonelist, z);\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 -fe98d17f3b74a9d6cf246fd88b667404f3227bbce0661e5449022c8407ac6d66 +3b4c6cb75ea64390f2bf2badb32518e1958fb948d592067bb17502e0e95be519
diff --git a/a/1.txt b/N2/1.txt index 3a0b781..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,57 +1 @@ ->From 14f7823986429b8374d18e3f648cd84575296e03 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Mon, 12 Jul 2010 18:00:37 +0800 -Subject: [PATCH 04/30] mm: tag reseve pages -Tag pages allocated from the reserves with a non-zero page->reserve. -This allows us to distinguish and account reserve pages. - -Since low-memory situations are transient, and unrelated the the actual -page (any page can be on the freelist when we run low), don't mark the -page in any permanent way - just pass along the information to the -allocatee. - -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> ---- - include/linux/mm_types.h | 1 + - mm/page_alloc.c | 4 +++- - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index b8bb9a6..a95a202 100644 ---- a/include/linux/mm_types.h -+++ b/include/linux/mm_types.h -@@ -71,6 +71,7 @@ struct page { - union { - pgoff_t index; /* Our offset within mapping. */ - void *freelist; /* SLUB: freelist req. slab lock */ -+ int reserve; /* page_alloc: page is a reserve page */ - }; - struct list_head lru; /* Pageout list, eg. active_list - * protected by zone->lru_lock ! -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 72a6be5..b9989c5 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -1656,8 +1656,10 @@ zonelist_scan: - try_this_zone: - page = buffered_rmqueue(preferred_zone, zone, order, - gfp_mask, migratetype); -- if (page) -+ if (page) { -+ page->reserve = !!(alloc_flags & ALLOC_NO_WATERMARKS); - break; -+ } - this_zone_full: - if (NUMA_BUILD) - zlc_mark_zone_full(zonelist, z); --- -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 2b88fc1..0aed7bb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,62 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From 14f7823986429b8374d18e3f648cd84575296e03 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Mon, 12 Jul 2010 18:00:37 +0800\n" - "Subject: [PATCH 04/30] mm: tag reseve pages\n" - "\n" - "Tag pages allocated from the reserves with a non-zero page->reserve.\n" - "This allows us to distinguish and account reserve pages.\n" - "\n" - "Since low-memory situations are transient, and unrelated the the actual\n" - "page (any page can be on the freelist when we run low), don't mark the\n" - "page in any permanent way - just pass along the information to the\n" - "allocatee.\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" - " include/linux/mm_types.h | 1 +\n" - " mm/page_alloc.c | 4 +++-\n" - " 2 files changed, 4 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h\n" - "index b8bb9a6..a95a202 100644\n" - "--- a/include/linux/mm_types.h\n" - "+++ b/include/linux/mm_types.h\n" - "@@ -71,6 +71,7 @@ struct page {\n" - " \tunion {\n" - " \t\tpgoff_t index;\t\t/* Our offset within mapping. */\n" - " \t\tvoid *freelist;\t\t/* SLUB: freelist req. slab lock */\n" - "+\t\tint reserve;\t\t/* page_alloc: page is a reserve page */\n" - " \t};\n" - " \tstruct list_head lru;\t\t/* Pageout list, eg. active_list\n" - " \t\t\t\t\t * protected by zone->lru_lock !\n" - "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n" - "index 72a6be5..b9989c5 100644\n" - "--- a/mm/page_alloc.c\n" - "+++ b/mm/page_alloc.c\n" - "@@ -1656,8 +1656,10 @@ zonelist_scan:\n" - " try_this_zone:\n" - " \t\tpage = buffered_rmqueue(preferred_zone, zone, order,\n" - " \t\t\t\t\t\tgfp_mask, migratetype);\n" - "-\t\tif (page)\n" - "+\t\tif (page) {\n" - "+\t\t\tpage->reserve = !!(alloc_flags & ALLOC_NO_WATERMARKS);\n" - " \t\t\tbreak;\n" - "+\t\t}\n" - " this_zone_full:\n" - " \t\tif (NUMA_BUILD)\n" - " \t\t\tzlc_mark_zone_full(zonelist, z);\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>" -fe98d17f3b74a9d6cf246fd88b667404f3227bbce0661e5449022c8407ac6d66 +cf3a3406e6c4ddf619a89e3ed7f8c2617a8f822a78677d9a612e26696b026efe
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.