diff options
| author | Christoph Lameter <cl@linux.com> | 2011-06-14 16:16:36 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-06-16 19:40:20 +0300 |
| commit | 3192b920bf7d0c528ab54e7d3689f44055316a37 (patch) | |
| tree | f907471f606a17cef0c1af4bc2187cdd4ee26c64 /include/linux/slab.h | |
| parent | bd50cfa89153a67429935a15e577a5eb5f10dd1b (diff) | |
| download | kernel-common-3192b920bf7d0c528ab54e7d3689f44055316a37.tar.gz kernel-common-3192b920bf7d0c528ab54e7d3689f44055316a37.tar.bz2 kernel-common-3192b920bf7d0c528ab54e7d3689f44055316a37.zip | |
slab, slub, slob: Unify alignment definition
Every slab has its on alignment definition in include/linux/sl?b_def.h. Extract those
and define a common set in include/linux/slab.h.
SLOB: As notes sometimes we need double word alignment on 32 bit. This gives all
structures allocated by SLOB a unsigned long long alignment like the others do.
SLAB: If ARCH_SLAB_MINALIGN is not set SLAB would set ARCH_SLAB_MINALIGN to
zero meaning no alignment at all. Give it the default unsigned long long alignment.
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index ad4dd1c8d30a..646a639a4aae 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -133,6 +133,16 @@ unsigned int kmem_cache_size(struct kmem_cache *); #define KMALLOC_MAX_SIZE (1UL << KMALLOC_SHIFT_HIGH) #define KMALLOC_MAX_ORDER (KMALLOC_SHIFT_HIGH - PAGE_SHIFT) +#ifdef ARCH_DMA_MINALIGN +#define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN +#else +#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long) +#endif + +#ifndef ARCH_SLAB_MINALIGN +#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) +#endif + /* * Common kmalloc functions provided by all allocators */ |