From: Christoph Lameter <clameter@sgi.com>

Forgot to add a parameter to the !CONFIG_SLUB_DEBUG version of
free_debug_processing. This causes a failure if slub is compiled
without debug support.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/slub.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN mm/slub.c~slub-do-our-own-locking-via-slab_lock-and-slab_unlock-fix mm/slub.c
--- a/mm/slub.c~slub-do-our-own-locking-via-slab_lock-and-slab_unlock-fix
+++ a/mm/slub.c
@@ -1012,7 +1012,8 @@ static inline int alloc_debug_processing
 	struct page *page, void *object, void *addr) { return 0; }
 
 static inline int free_debug_processing(struct kmem_cache *s,
-	struct page *page, void *object, void *addr) { return 0; }
+	struct page *page, void *object, void *addr, unsigned long state)
+						{ return 0; }
 
 static inline int slab_pad_check(struct kmem_cache *s, struct page *page)
 			{ return 1; }
_