From ae8be281b3e38bb47847ec5dd89b8ee07b407cb8 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Fri, 8 Jun 2007 13:46:46 -0700
Subject: [PATCH] --- yaml --- r: 57463 b: refs/heads/master c:
 3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 h: refs/heads/master i:   57461:
 237579e8aaed6a55bca6d5fe1be98b3141618130   57459:
 48f51da198d98530b943409cfbe4dbac003931b9   57455:
 86102841a49d6ec52fe99ef163a656079a4c3a5b v: v3

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

diff --git a/[refs] b/[refs]
index d2027a560886..8d6e5504e99a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a210906c1b791af1434323f69427286039c9c8b9
+refs/heads/master: 3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 2e71a328aa09..6d65cf4e4b2e 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3539,7 +3539,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp)
 	check_irq_off();
 	objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));
 
-	if (use_alien_caches && cache_free_alien(cachep, objp))
+	if (cache_free_alien(cachep, objp))
 		return;
 
 	if (likely(ac->avail < ac->limit)) {