Skip to content

Commit

Permalink
mm: Move ARCH_SLAB_MINALIGN and ARCH_KMALLOC_MINALIGN to <linux/slob_…
Browse files Browse the repository at this point in the history
…def.h>

Acked-by: Herbert Xu <[email protected]>
Signed-off-by: David Woodhouse <[email protected]>
Signed-off-by: Pekka Enberg <[email protected]>
  • Loading branch information
dwmw2 authored and Pekka Enberg committed May 19, 2010
1 parent 1f0ce8b commit bac49ce
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 8 additions & 0 deletions include/linux/slob_def.h
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 0 additions & 8 deletions mm/slob.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bac49ce

Please sign in to comment.