diff for duplicates of <4DF1C9DE.4070605@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index adde28e..24674be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,52 +50,3 @@ Then, the revert patch is here. - - - - ->From beaf8c4457fffeb3a4bfb3a5109fbcddcfc686cb Mon Sep 17 00:00:00 2001 -From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> -Date: Fri, 10 Jun 2011 15:27:06 +0900 -Subject: [PATCH] Revert "mm: fail GFP_DMA allocations when ZONE_DMA is not configured" - -Dmitry Eremin-Solenikov reported IrDA driver on PXA started to fail -after commit a197b59ae (mm: fail GFP_DMA allocations when ZONE_DMA -is not configured). Pavel Mechek mentioned it also broke zaurus. - -Even though the concept of commit a197b59ae is correct. It's no worth -to break ARM. Thus this should be reverted until finished to audit -all GFP_DMA users. - -This reverts commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac. - -Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> -Reported-by: Pavel Machek <pavel@ucw.cz> -Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> -Cc: David Rientjes <rientjes@google.com> -Cc: Russell King - ARM Linux <linux@arm.linux.org.uk> -Cc: Mel Gorman <mel@csn.ul.ie> -Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> -Cc: Rik van Riel <riel@redhat.com> -Cc: Andrew Morton <akpm@linux-foundation.org> ---- - mm/page_alloc.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index a4e1db3..4e8985a 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -2247,10 +2247,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, - - if (should_fail_alloc_page(gfp_mask, order)) - return NULL; --#ifndef CONFIG_ZONE_DMA -- if (WARN_ON_ONCE(gfp_mask & __GFP_DMA)) -- return NULL; --#endif - - /* - * Check the zones suitable for the gfp_mask contain at least one --- -1.7.3.1 diff --git a/a/content_digest b/N1/content_digest index 16beaa2..15a8dd0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -73,55 +73,6 @@ "> If you cannot fix it yourself, then f*(&!@$#ng not break it.\n" "\n" "\n" - "Then, the revert patch is here.\n" - "\n" - "\n" - "\n" - "\n" - ">From beaf8c4457fffeb3a4bfb3a5109fbcddcfc686cb Mon Sep 17 00:00:00 2001\n" - "From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\n" - "Date: Fri, 10 Jun 2011 15:27:06 +0900\n" - "Subject: [PATCH] Revert \"mm: fail GFP_DMA allocations when ZONE_DMA is not configured\"\n" - "\n" - "Dmitry Eremin-Solenikov reported IrDA driver on PXA started to fail\n" - "after commit a197b59ae (mm: fail GFP_DMA allocations when ZONE_DMA\n" - "is not configured). Pavel Mechek mentioned it also broke zaurus.\n" - "\n" - "Even though the concept of commit a197b59ae is correct. It's no worth\n" - "to break ARM. Thus this should be reverted until finished to audit\n" - "all GFP_DMA users.\n" - "\n" - "This reverts commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac.\n" - "\n" - "Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>\n" - "Reported-by: Pavel Machek <pavel@ucw.cz>\n" - "Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\n" - "Cc: David Rientjes <rientjes@google.com>\n" - "Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>\n" - "Cc: Mel Gorman <mel@csn.ul.ie>\n" - "Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\n" - "Cc: Rik van Riel <riel@redhat.com>\n" - "Cc: Andrew Morton <akpm@linux-foundation.org>\n" - "---\n" - " mm/page_alloc.c | 4 ----\n" - " 1 files changed, 0 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n" - "index a4e1db3..4e8985a 100644\n" - "--- a/mm/page_alloc.c\n" - "+++ b/mm/page_alloc.c\n" - "@@ -2247,10 +2247,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,\n" - "\n" - " \tif (should_fail_alloc_page(gfp_mask, order))\n" - " \t\treturn NULL;\n" - "-#ifndef CONFIG_ZONE_DMA\n" - "-\tif (WARN_ON_ONCE(gfp_mask & __GFP_DMA))\n" - "-\t\treturn NULL;\n" - "-#endif\n" - "\n" - " \t/*\n" - " \t * Check the zones suitable for the gfp_mask contain at least one\n" - "-- \n" - 1.7.3.1 + Then, the revert patch is here. -f61245c5843cb3a67b9290d02863081bc811d0ea03f79c8a512e1a2549308757 +576eab3f4f822b5022a261a82d435234ef77a1c3394010d8cc01c05ef1040269
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.