diff options
author | Christoph Lameter <cl@linux.com> | 2011-06-14 17:16:36 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2011-06-16 12:40:20 -0400 |
commit | 3192b920bf7d0c528ab54e7d3689f44055316a37 (patch) | |
tree | f907471f606a17cef0c1af4bc2187cdd4ee26c64 /include/linux/slab.h | |
parent | bd50cfa89153a67429935a15e577a5eb5f10dd1b (diff) |
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 *); | |||
133 | #define KMALLOC_MAX_SIZE (1UL << KMALLOC_SHIFT_HIGH) | 133 | #define KMALLOC_MAX_SIZE (1UL << KMALLOC_SHIFT_HIGH) |
134 | #define KMALLOC_MAX_ORDER (KMALLOC_SHIFT_HIGH - PAGE_SHIFT) | 134 | #define KMALLOC_MAX_ORDER (KMALLOC_SHIFT_HIGH - PAGE_SHIFT) |
135 | 135 | ||
136 | #ifdef ARCH_DMA_MINALIGN | ||
137 | #define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN | ||
138 | #else | ||
139 | #define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long) | ||
140 | #endif | ||
141 | |||
142 | #ifndef ARCH_SLAB_MINALIGN | ||
143 | #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) | ||
144 | #endif | ||
145 | |||
136 | /* | 146 | /* |
137 | * Common kmalloc functions provided by all allocators | 147 | * Common kmalloc functions provided by all allocators |
138 | */ | 148 | */ |