Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[karo-tx-linux.git] / include / linux / slob_def.h

diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
index bb5368df4be84397f28ec90b134b63687fdcaed6..62667f72c2ef795c128b58d75a141e65beb16a35 100644 (file)
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
@@ -1,6 +1,14 @@
 #ifndef __LINUX_SLOB_DEF_H
 #define __LINUX_SLOB_DEF_H
 
+#ifndef ARCH_KMALLOC_MINALIGN
+#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long)
+#endif
+
+#ifndef ARCH_SLAB_MINALIGN
+#define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
+#endif
+
 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
 static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
@@ -34,9 +42,4 @@ static __always_inline void *__kmalloc(size_t size, gfp_t flags)
        return kmalloc(size, flags);
 }
 
-static inline void kmem_cache_init_late(void)
-{
-       /* Nothing to do */
-}
-
 #endif /* __LINUX_SLOB_DEF_H */