diff options
| author | Christoph Lameter <clameter@sgi.com> | 2007-05-23 13:57:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 20:14:11 -0700 |
| commit | c12b3c62513ecf95c979d5c1785f99562b9dd10d (patch) | |
| tree | fd6e14ac0c62a0bc6e00d6543f54beea8abb6e8b /mm | |
| parent | 72fcde966252abd17d70e4e216a0411a34523a8f (diff) | |
| download | linux-3.10-c12b3c62513ecf95c979d5c1785f99562b9dd10d.tar.gz linux-3.10-c12b3c62513ecf95c979d5c1785f99562b9dd10d.tar.bz2 linux-3.10-c12b3c62513ecf95c979d5c1785f99562b9dd10d.zip | |
SLUB Debug: Fix object size calculation
The object size calculation is wrong if !CONFIG_SLUB_DEBUG because the
#ifdef CONFIG_SLUB_DEBUG is now switching off the size adjustments for
DESTROY_BY_RCU and ctor.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 98801d404d6..0b0c2a3e76f 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1917,7 +1917,6 @@ static int calculate_sizes(struct kmem_cache *s) */ s->inuse = size; -#ifdef CONFIG_SLUB_DEBUG if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) || s->ctor)) { /* @@ -1932,6 +1931,7 @@ static int calculate_sizes(struct kmem_cache *s) size += sizeof(void *); } +#ifdef CONFIG_SLUB_DEBUG if (flags & SLAB_STORE_USER) /* * Need to store information about allocs and frees after |