diff for duplicates of <20100713101725.2835.41105.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 85017d0..fac4ba0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,9 +76,3 @@ index ebf0af7..72a6be5 100644 int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET; -- 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 0e42670..6aaa12a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -93,12 +93,6 @@ " \tstruct task_struct *p = current;\n" " \tint alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET;\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 -afac9ce570a3027468cf5e4cb3ad38978d9aa75708653fcdec8afcef572cba59 +8171db81a76a2a0ea889171a5ec8afed1d8ee45eede05aabb8e1ee4b4ff53ec5
diff --git a/a/1.txt b/N2/1.txt index 85017d0..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,84 +1 @@ ->From 8a554f86ab2fd4d8a1daecaef4cc5bb3901c4423 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Mon, 12 Jul 2010 17:59:52 +0800 -Subject: [PATCH 03/30] mm: expose gfp_to_alloc_flags() -Expose the gfp to alloc_flags mapping, so we can use it in other parts -of the vm. - -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/internal.h | 15 +++++++++++++++ - mm/page_alloc.c | 16 +--------------- - 2 files changed, 16 insertions(+), 15 deletions(-) - -diff --git a/mm/internal.h b/mm/internal.h -index 6a697bb..3e2cc3a 100644 ---- a/mm/internal.h -+++ b/mm/internal.h -@@ -185,6 +185,21 @@ static inline struct page *mem_map_next(struct page *iter, - #define __paginginit __init - #endif - -+/* The ALLOC_WMARK bits are used as an index to zone->watermark */ -+#define ALLOC_WMARK_MIN WMARK_MIN -+#define ALLOC_WMARK_LOW WMARK_LOW -+#define ALLOC_WMARK_HIGH WMARK_HIGH -+#define ALLOC_NO_WATERMARKS 0x04 /* don't check watermarks at all */ -+ -+/* Mask to get the watermark bits */ -+#define ALLOC_WMARK_MASK (ALLOC_NO_WATERMARKS-1) -+ -+#define ALLOC_HARDER 0x10 /* try to alloc harder */ -+#define ALLOC_HIGH 0x20 /* __GFP_HIGH set */ -+#define ALLOC_CPUSET 0x40 /* check for correct cpuset */ -+ -+int gfp_to_alloc_flags(gfp_t gfp_mask); -+ - /* Memory initialisation debug and verification */ - enum mminit_level { - MMINIT_WARNING, -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index ebf0af7..72a6be5 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -1345,19 +1345,6 @@ failed: - return NULL; - } - --/* The ALLOC_WMARK bits are used as an index to zone->watermark */ --#define ALLOC_WMARK_MIN WMARK_MIN --#define ALLOC_WMARK_LOW WMARK_LOW --#define ALLOC_WMARK_HIGH WMARK_HIGH --#define ALLOC_NO_WATERMARKS 0x04 /* don't check watermarks at all */ -- --/* Mask to get the watermark bits */ --#define ALLOC_WMARK_MASK (ALLOC_NO_WATERMARKS-1) -- --#define ALLOC_HARDER 0x10 /* try to alloc harder */ --#define ALLOC_HIGH 0x20 /* __GFP_HIGH set */ --#define ALLOC_CPUSET 0x40 /* check for correct cpuset */ -- - #ifdef CONFIG_FAIL_PAGE_ALLOC - - static struct fail_page_alloc_attr { -@@ -1911,8 +1898,7 @@ void wake_all_kswapd(unsigned int order, struct zonelist *zonelist, - wakeup_kswapd(zone, order); - } - --static inline int --gfp_to_alloc_flags(gfp_t gfp_mask) -+int gfp_to_alloc_flags(gfp_t gfp_mask) - { - struct task_struct *p = current; - int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET; --- -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 0e42670..fc1f15b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,89 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From 8a554f86ab2fd4d8a1daecaef4cc5bb3901c4423 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Mon, 12 Jul 2010 17:59:52 +0800\n" - "Subject: [PATCH 03/30] mm: expose gfp_to_alloc_flags()\n" - "\n" - "Expose the gfp to alloc_flags mapping, so we can use it in other parts\n" - "of the vm.\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/internal.h | 15 +++++++++++++++\n" - " mm/page_alloc.c | 16 +---------------\n" - " 2 files changed, 16 insertions(+), 15 deletions(-)\n" - "\n" - "diff --git a/mm/internal.h b/mm/internal.h\n" - "index 6a697bb..3e2cc3a 100644\n" - "--- a/mm/internal.h\n" - "+++ b/mm/internal.h\n" - "@@ -185,6 +185,21 @@ static inline struct page *mem_map_next(struct page *iter,\n" - " #define __paginginit __init\n" - " #endif\n" - " \n" - "+/* The ALLOC_WMARK bits are used as an index to zone->watermark */\n" - "+#define ALLOC_WMARK_MIN\t\tWMARK_MIN\n" - "+#define ALLOC_WMARK_LOW\t\tWMARK_LOW\n" - "+#define ALLOC_WMARK_HIGH\tWMARK_HIGH\n" - "+#define ALLOC_NO_WATERMARKS\t0x04 /* don't check watermarks at all */\n" - "+\n" - "+/* Mask to get the watermark bits */\n" - "+#define ALLOC_WMARK_MASK\t(ALLOC_NO_WATERMARKS-1)\n" - "+\n" - "+#define ALLOC_HARDER\t\t0x10 /* try to alloc harder */\n" - "+#define ALLOC_HIGH\t\t0x20 /* __GFP_HIGH set */\n" - "+#define ALLOC_CPUSET\t\t0x40 /* check for correct cpuset */\n" - "+\n" - "+int gfp_to_alloc_flags(gfp_t gfp_mask);\n" - "+\n" - " /* Memory initialisation debug and verification */\n" - " enum mminit_level {\n" - " \tMMINIT_WARNING,\n" - "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n" - "index ebf0af7..72a6be5 100644\n" - "--- a/mm/page_alloc.c\n" - "+++ b/mm/page_alloc.c\n" - "@@ -1345,19 +1345,6 @@ failed:\n" - " \treturn NULL;\n" - " }\n" - " \n" - "-/* The ALLOC_WMARK bits are used as an index to zone->watermark */\n" - "-#define ALLOC_WMARK_MIN\t\tWMARK_MIN\n" - "-#define ALLOC_WMARK_LOW\t\tWMARK_LOW\n" - "-#define ALLOC_WMARK_HIGH\tWMARK_HIGH\n" - "-#define ALLOC_NO_WATERMARKS\t0x04 /* don't check watermarks at all */\n" - "-\n" - "-/* Mask to get the watermark bits */\n" - "-#define ALLOC_WMARK_MASK\t(ALLOC_NO_WATERMARKS-1)\n" - "-\n" - "-#define ALLOC_HARDER\t\t0x10 /* try to alloc harder */\n" - "-#define ALLOC_HIGH\t\t0x20 /* __GFP_HIGH set */\n" - "-#define ALLOC_CPUSET\t\t0x40 /* check for correct cpuset */\n" - "-\n" - " #ifdef CONFIG_FAIL_PAGE_ALLOC\n" - " \n" - " static struct fail_page_alloc_attr {\n" - "@@ -1911,8 +1898,7 @@ void wake_all_kswapd(unsigned int order, struct zonelist *zonelist,\n" - " \t\twakeup_kswapd(zone, order);\n" - " }\n" - " \n" - "-static inline int\n" - "-gfp_to_alloc_flags(gfp_t gfp_mask)\n" - "+int gfp_to_alloc_flags(gfp_t gfp_mask)\n" - " {\n" - " \tstruct task_struct *p = current;\n" - " \tint alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET;\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>" -afac9ce570a3027468cf5e4cb3ad38978d9aa75708653fcdec8afcef572cba59 +178b812a168312fd8020e38e9989585e2ad3b3c3fcc0f4aea3389c43cd3b04d5
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.