Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4581ced3 authored by David Woodhouse's avatar David Woodhouse Committed by Pekka Enberg
Browse files

mm: Move ARCH_SLAB_MINALIGN and ARCH_KMALLOC_MINALIGN to <linux/slub_def.h> 



Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent bac49ce4

include/linux/slub_def.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,14 @@ struct kmem_cache { 




#define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE)

#define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE)





#ifndef ARCH_KMALLOC_MINALIGN

#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long)

#endif



#ifndef ARCH_SLAB_MINALIGN

#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)

#endif



/*

/*

 * Maximum kmalloc object size handled by SLUB. Larger object allocations

 * Maximum kmalloc object size handled by SLUB. Larger object allocations

 * are passed through to the page allocator. The page allocator "fastpath"

 * are passed through to the page allocator. The page allocator "fastpath"

mm/slub.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -157,14 +157,6 @@ 
#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \

#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \

		SLAB_CACHE_DMA | SLAB_NOTRACK)

		SLAB_CACHE_DMA | SLAB_NOTRACK)





#ifndef ARCH_KMALLOC_MINALIGN

#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long)

#endif



#ifndef ARCH_SLAB_MINALIGN

#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)

#endif



#define OO_SHIFT	16

#define OO_SHIFT	16

#define OO_MASK		((1 << OO_SHIFT) - 1)

#define OO_MASK		((1 << OO_SHIFT) - 1)

#define MAX_OBJS_PER_PAGE	65535 /* since page.objects is u16 */

#define MAX_OBJS_PER_PAGE	65535 /* since page.objects is u16 */