diff options
| author | Christoph Lameter <cl@linux.com> | 2012-11-28 16:23:16 +0000 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-12-11 12:14:28 +0200 |
| commit | 4590685546a374fb0f60682ce0e3a6fd48911d46 (patch) | |
| tree | 1287ce1e1633067f8bf2cf9f93f1d6fe8a1f8908 /mm/slab.c | |
| parent | 2f9baa9fcf8d0a204ca129a671d6086cc100faab (diff) | |
| download | linux-3.10-4590685546a374fb0f60682ce0e3a6fd48911d46.tar.gz linux-3.10-4590685546a374fb0f60682ce0e3a6fd48911d46.tar.bz2 linux-3.10-4590685546a374fb0f60682ce0e3a6fd48911d46.zip | |
mm/sl[aou]b: Common alignment code
Extract the code to do object alignment from the allocators.
Do the alignment calculations in slab_common so that the
__kmem_cache_create functions of the allocators do not have
to deal with alignment.
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/mm/slab.c b/mm/slab.c index e1790e56fd8..2c3a2e0394d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2337,22 +2337,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags) size &= ~(BYTES_PER_WORD - 1); } - /* calculate the final buffer alignment: */ - - /* 1) arch recommendation: can be overridden for debug */ - if (flags & SLAB_HWCACHE_ALIGN) { - /* - * Default alignment: as specified by the arch code. Except if - * an object is really small, then squeeze multiple objects into - * one cacheline. - */ - ralign = cache_line_size(); - while (size <= ralign / 2) - ralign /= 2; - } else { - ralign = BYTES_PER_WORD; - } - /* * Redzoning and user store require word alignment or possibly larger. * Note this will be overridden by architecture or caller mandated @@ -2369,10 +2353,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags) size &= ~(REDZONE_ALIGN - 1); } - /* 2) arch mandated alignment */ - if (ralign < ARCH_SLAB_MINALIGN) { - ralign = ARCH_SLAB_MINALIGN; - } /* 3) caller mandated alignment */ if (ralign < cachep->align) { ralign = cachep->align; |