diff for duplicates of <20100713101843.2835.12822.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 1e3f06d..58d6436 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,9 +55,3 @@ index 21d64f7..f7d3060 100644 unlikely(test_thread_flag(TIF_MEMDIE))) -- 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 f704133..0a1bc1f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -72,12 +72,6 @@ " \t\telse if (!in_interrupt() &&\n" " \t\t\t\tunlikely(test_thread_flag(TIF_MEMDIE)))\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 -51d0901b04a7e135548bbc305e8367f3c7ab2efa52c518c62ec88a70e49b2ef1 +7b0e3da5c572e4dba9dd669657a5d99341481b9766047b202018171b583f61c9
diff --git a/a/1.txt b/N2/1.txt index 1e3f06d..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,63 +1 @@ ->From 78618cc83e6a21b876c30a8fb3940ccc1f5b99e1 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 10:49:16 +0800 -Subject: [PATCH 10/30] mm: __GFP_MEMALLOC -__GFP_MEMALLOC will allow the allocation to disregard the watermarks, -much like PF_MEMALLOC. - -It allows one to pass along the memalloc state in object related allocation -flags as opposed to task related flags, such as sk->sk_allocation. - -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/gfp.h | 3 ++- - mm/page_alloc.c | 4 +++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/include/linux/gfp.h b/include/linux/gfp.h -index 975609c..c608e26 100644 ---- a/include/linux/gfp.h -+++ b/include/linux/gfp.h -@@ -47,6 +47,7 @@ struct vm_area_struct; - #define __GFP_REPEAT ((__force gfp_t)0x400u) /* See above */ - #define __GFP_NOFAIL ((__force gfp_t)0x800u) /* See above */ - #define __GFP_NORETRY ((__force gfp_t)0x1000u)/* See above */ -+#define __GFP_MEMALLOC ((__force gfp_t)0x2000u)/* Use emergency reserves */ - #define __GFP_COMP ((__force gfp_t)0x4000u)/* Add compound page metadata */ - #define __GFP_ZERO ((__force gfp_t)0x8000u)/* Return zeroed page on success */ - #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */ -@@ -98,7 +99,7 @@ struct vm_area_struct; - /* Control page allocator reclaim behavior */ - #define GFP_RECLAIM_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\ - __GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\ -- __GFP_NORETRY|__GFP_NOMEMALLOC) -+ __GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC) - - /* Control slab gfp mask during early boot */ - #define GFP_BOOT_MASK (__GFP_BITS_MASK & ~(__GFP_WAIT|__GFP_IO|__GFP_FS)) -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 21d64f7..f7d3060 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -1930,7 +1930,9 @@ int gfp_to_alloc_flags(gfp_t gfp_mask) - alloc_flags |= ALLOC_HARDER; - - if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) { -- if (!in_irq() && (p->flags & PF_MEMALLOC)) -+ if (gfp_mask & __GFP_MEMALLOC) -+ alloc_flags |= ALLOC_NO_WATERMARKS; -+ else if (!in_irq() && (p->flags & PF_MEMALLOC)) - alloc_flags |= ALLOC_NO_WATERMARKS; - else if (!in_interrupt() && - unlikely(test_thread_flag(TIF_MEMDIE))) --- -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 f704133..a2af085 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,68 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From 78618cc83e6a21b876c30a8fb3940ccc1f5b99e1 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 10:49:16 +0800\n" - "Subject: [PATCH 10/30] mm: __GFP_MEMALLOC\n" - "\n" - "__GFP_MEMALLOC will allow the allocation to disregard the watermarks,\n" - "much like PF_MEMALLOC.\n" - "\n" - "It allows one to pass along the memalloc state in object related allocation\n" - "flags as opposed to task related flags, such as sk->sk_allocation.\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/gfp.h | 3 ++-\n" - " mm/page_alloc.c | 4 +++-\n" - " 2 files changed, 5 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/include/linux/gfp.h b/include/linux/gfp.h\n" - "index 975609c..c608e26 100644\n" - "--- a/include/linux/gfp.h\n" - "+++ b/include/linux/gfp.h\n" - "@@ -47,6 +47,7 @@ struct vm_area_struct;\n" - " #define __GFP_REPEAT\t((__force gfp_t)0x400u)\t/* See above */\n" - " #define __GFP_NOFAIL\t((__force gfp_t)0x800u)\t/* See above */\n" - " #define __GFP_NORETRY\t((__force gfp_t)0x1000u)/* See above */\n" - "+#define __GFP_MEMALLOC ((__force gfp_t)0x2000u)/* Use emergency reserves */\n" - " #define __GFP_COMP\t((__force gfp_t)0x4000u)/* Add compound page metadata */\n" - " #define __GFP_ZERO\t((__force gfp_t)0x8000u)/* Return zeroed page on success */\n" - " #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */\n" - "@@ -98,7 +99,7 @@ struct vm_area_struct;\n" - " /* Control page allocator reclaim behavior */\n" - " #define GFP_RECLAIM_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\\\n" - " \t\t\t__GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\\\n" - "-\t\t\t__GFP_NORETRY|__GFP_NOMEMALLOC)\n" - "+\t\t\t__GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC)\n" - " \n" - " /* Control slab gfp mask during early boot */\n" - " #define GFP_BOOT_MASK (__GFP_BITS_MASK & ~(__GFP_WAIT|__GFP_IO|__GFP_FS))\n" - "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n" - "index 21d64f7..f7d3060 100644\n" - "--- a/mm/page_alloc.c\n" - "+++ b/mm/page_alloc.c\n" - "@@ -1930,7 +1930,9 @@ int gfp_to_alloc_flags(gfp_t gfp_mask)\n" - " \t\talloc_flags |= ALLOC_HARDER;\n" - " \n" - " \tif (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {\n" - "-\t\tif (!in_irq() && (p->flags & PF_MEMALLOC))\n" - "+\t\tif (gfp_mask & __GFP_MEMALLOC)\n" - "+\t\t\talloc_flags |= ALLOC_NO_WATERMARKS;\n" - "+\t\telse if (!in_irq() && (p->flags & PF_MEMALLOC))\n" - " \t\t\talloc_flags |= ALLOC_NO_WATERMARKS;\n" - " \t\telse if (!in_interrupt() &&\n" - " \t\t\t\tunlikely(test_thread_flag(TIF_MEMDIE)))\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>" -51d0901b04a7e135548bbc305e8367f3c7ab2efa52c518c62ec88a70e49b2ef1 +1f52ac3efd5493008c057c6593f873e814742d86982c39c8d56d3a1ddf3cdc5c
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.