From 15a9c3285e62a39fc67848d3e2d212ff468a26e9 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux-foundation.org>
Date: Thu, 27 May 2010 09:17:17 -0500
Subject: [PATCH] --- yaml --- r: 199444 b: refs/heads/master c:
 0f1f694260e0d35b5ce7d471f6e679c3dd4d7d94 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/slub_def.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2f0cab2451bc..18e51240ad20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73367bd8eef4f4eb311005886aaa916013073265
+refs/heads/master: 0f1f694260e0d35b5ce7d471f6e679c3dd4d7d94
diff --git a/trunk/include/linux/slub_def.h b/trunk/include/linux/slub_def.h
index 6ac37664e8fe..4ba59cfc1f75 100644
--- a/trunk/include/linux/slub_def.h
+++ b/trunk/include/linux/slub_def.h
@@ -137,7 +137,7 @@ struct kmem_cache {
 #ifdef CONFIG_ZONE_DMA
 #define SLUB_DMA __GFP_DMA
 /* Reserve extra caches for potential DMA use */
-#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT - 6)
+#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT)
 #else
 /* Disable DMA functionality */
 #define SLUB_DMA (__force gfp_t)0