From e9331c2365cdce5fae1d10008c0102fc4d7608bf Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 16 Jun 2009 15:32:16 -0700
Subject: [PATCH] --- yaml --- r: 151545 b: refs/heads/master c:
 b6e68bc1baed9b6972a250aba66b8c5276cf6fb1 h: refs/heads/master i:   151543:
 fde6b1d21c69cacc29c2e7cf880fd4fa24253089 v: v3

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

diff --git a/[refs] b/[refs]
index 9bfb228129a1..e567289bcf26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62bc62a873116805774ffd37d7f86aa4faa832b1
+refs/heads/master: b6e68bc1baed9b6972a250aba66b8c5276cf6fb1
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index bb3254c95cd2..744ab9a665a2 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -898,7 +898,6 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
   */
 
 static int use_alien_caches __read_mostly = 1;
-static int numa_platform __read_mostly = 1;
 static int __init noaliencache_setup(char *s)
 {
 	use_alien_caches = 0;
@@ -1457,10 +1456,8 @@ void __init kmem_cache_init(void)
 	int order;
 	int node;
 
-	if (num_possible_nodes() == 1) {
+	if (num_possible_nodes() == 1)
 		use_alien_caches = 0;
-		numa_platform = 0;
-	}
 
 	for (i = 0; i < NUM_INIT_LISTS; i++) {
 		kmem_list3_init(&initkmem_list3[i]);
@@ -3590,7 +3587,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp)
 	 * variable to skip the call, which is mostly likely to be present in
 	 * the cache.
 	 */
-	if (numa_platform && cache_free_alien(cachep, objp))
+	if (nr_online_nodes > 1 && cache_free_alien(cachep, objp))
 		return;
 
 	if (likely(ac->avail < ac->limit)) {