---

yaml --- r: 198012 b: refs/heads/master c: bac49ce h: refs/heads/master v: v3
git-mirror · May 19, 2010 · 747e090 · 747e090
1 parent b540fe2
commit 747e090
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f0ce8b3dd667dca720a47869f8110c298f0e5b8
+refs/heads/master: bac49ce42a33f53beb7cf04e9a0600879d6265ca
diff --git a/trunk/include/linux/slob_def.h b/trunk/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,

diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
@@ -467,14 +467,6 @@ static void slob_free(void *block, int size)
  * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
  */
 
-#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 *__kmalloc_node(size_t size, gfp_t gfp, int node)
 {
 	unsigned int *m;