[folded-merged] mm-zonelist-enumerate-zonelists-array-index-fix.patch removed from -mm tree

[folded-merged] mm-zonelist-enumerate-zonelists-array-index-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-zonelist-enumerate-zonelists-array-index-fix
has been removed from the -mm tree.  Its filename was
     mm-zonelist-enumerate-zonelists-array-index-fix.patch

This patch was dropped because it was folded into mm-zonelist-enumerate-zonelists-array-index.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-zonelist-enumerate-zonelists-array-index-fix

Fix CONFIG_NUMA=n build

include/linux/gfp.h: In function 'gfp_zonelist':
include/linux/gfp.h:388: error: 'ZONELIST_NOFALLBACK' undeclared (first use in this function)

Cc: David Rientjes <rientjes@google.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/gfp.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN include/linux/gfp.h~mm-zonelist-enumerate-zonelists-array-index-fix include/linux/gfp.h
--- a/include/linux/gfp.h~mm-zonelist-enumerate-zonelists-array-index-fix
+++ a/include/linux/gfp.h
@@ -384,9 +384,10 @@ static inline enum zone_type gfp_zone(gf
 
 static inline int gfp_zonelist(gfp_t flags)
 {
-	if (IS_ENABLED(CONFIG_NUMA) && unlikely(flags & __GFP_THISNODE))
+#ifdef CONFIG_NUMA
+	if (unlikely(flags & __GFP_THISNODE))
 		return ZONELIST_NOFALLBACK;