From 0b9774026752cbfa929e116d2fc35eaf8de373c0 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Mon, 16 May 2011 15:26:06 -0500
Subject: [PATCH] --- yaml --- r: 248623 b: refs/heads/master c:
 6332aa9d25e911cc97aa9cc09acee21afda07ea6 h: refs/heads/master i:   248621:
 2b3b75c19ec9353f819a9ddf683cf4aace1f4fb3   248619:
 984499756acbdbfc55b0111ba3696d2b37c168c9   248615:
 7953d56f3d8a5fc35a60b4a41cc1f911777f9278   248607:
 564e7c12c471a5d10b0768936e97bae6556a8e8c v: v3

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

diff --git a/[refs] b/[refs]
index 13085661b820..f5e762fde197 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1759415e630e5db0dd2390df9f94892cbfb9a8a2
+refs/heads/master: 6332aa9d25e911cc97aa9cc09acee21afda07ea6
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 461199f019d6..8657ab838b82 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -326,6 +326,7 @@ static inline int oo_objects(struct kmem_cache_order_objects x)
 	return x.x & OO_MASK;
 }
 
+#ifdef CONFIG_SLUB_DEBUG
 /*
  * Determine a map of object in use on a page.
  *
@@ -341,7 +342,6 @@ static void get_map(struct kmem_cache *s, struct page *page, unsigned long *map)
 		set_bit(slab_index(p, s, addr), map);
 }
 
-#ifdef CONFIG_SLUB_DEBUG
 /*
  * Debug settings:
  */