From b179103647d831fe835e5a613bf5f3a563369239 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Thu, 24 Mar 2011 14:51:38 -0500
Subject: [PATCH] --- yaml --- r: 242330 b: refs/heads/master c:
 b8c4c96ed4cdecf5ae51fc6f4c006658e873047f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index daea545a9fd7..0712d9b8c228 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9b615de4663c4b852e07257e9f967df6a0161c0
+refs/heads/master: b8c4c96ed4cdecf5ae51fc6f4c006658e873047f
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index a6a783594ad4..f881874843a5 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1604,7 +1604,7 @@ static inline void note_cmpxchg_failure(const char *n,
 
 void init_kmem_cache_cpus(struct kmem_cache *s)
 {
-#if defined(CONFIG_CMPXCHG_LOCAL) && defined(CONFIG_PREEMPT)
+#ifdef CONFIG_CMPXCHG_LOCAL
 	int cpu;
 
 	for_each_possible_cpu(cpu)