From c33914689582d58a9b47ad5ad8776f0725b98dd6 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Wed, 25 Aug 2010 14:07:16 -0500
Subject: [PATCH] --- yaml --- r: 215940 b: refs/heads/master c:
 7d550c56a24b20e91ec469054230bd2e2485996a h: refs/heads/master v: v3

---
 [refs]          |  2 +-
 trunk/mm/slub.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bcbeeebc9486..52b132a4309a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df275af8db8220d7e3f1bf97b6ac7aad05f96f0
+refs/heads/master: 7d550c56a24b20e91ec469054230bd2e2485996a
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 6608f2bc310b..c1add106c431 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1098,6 +1098,18 @@ static inline void inc_slabs_node(struct kmem_cache *s, int node,
 							int objects) {}
 static inline void dec_slabs_node(struct kmem_cache *s, int node,
 							int objects) {}
+
+static inline int slab_pre_alloc_hook(struct kmem_cache *s, gfp_t flags)
+							{ return 0; }
+
+static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
+		void *object) {}
+
+static inline void slab_free_hook(struct kmem_cache *s, void *x) {}
+
+static inline void slab_free_hook_irq(struct kmem_cache *s,
+		void *object) {}
+
 #endif
 
 /*