From 2ee1aea7d3e9c7b7eaeb47d9e3a9376e1537083a Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Fri, 24 Mar 2006 03:16:12 -0800
Subject: [PATCH] --- yaml --- r: 23424 b: refs/heads/master c:
 b2455396be35383c4eebc6745cc718b1dd9e23df h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dbf47710ba5b..99da93fdedd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 151a44202d097ae8b1bbaa6d8d2f97df30e3cd1e
+refs/heads/master: b2455396be35383c4eebc6745cc718b1dd9e23df
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index f80b52388a12..26138c9f8f00 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -2809,8 +2809,7 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags)
 	struct array_cache *ac;
 
 #ifdef CONFIG_NUMA
-	if (unlikely(current->flags & (PF_SPREAD_PAGE | PF_SPREAD_SLAB |
-							PF_MEMPOLICY))) {
+	if (unlikely(current->flags & (PF_SPREAD_SLAB | PF_MEMPOLICY))) {
 		objp = alternate_node_alloc(cachep, flags);
 		if (objp != NULL)
 			return objp;
@@ -2849,7 +2848,7 @@ static __always_inline void *__cache_alloc(struct kmem_cache *cachep,
 
 #ifdef CONFIG_NUMA
 /*
- * Try allocating on another node if PF_SPREAD_PAGE|PF_SPREAD_SLAB|PF_MEMPOLICY.
+ * Try allocating on another node if PF_SPREAD_SLAB|PF_MEMPOLICY.
  *
  * If we are in_interrupt, then process context, including cpusets and
  * mempolicy, may not apply and should not be used for allocation policy.