Merge commit 'linus/master' into HEAD

[net-next-2.6.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index e339fcf17cd36fb6d5f5ad17cae1a28916e1d0b1..2da8372519f5e96a32027a9be8b0efc66f35b907 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -326,4 +326,6 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
        return kmalloc_node(size, flags | __GFP_ZERO, node);
 }
 
+void __init kmem_cache_init_late(void);
+
 #endif /* _LINUX_SLAB_H */