diff options
author | Christoph Lameter <cl@linux.com> | 2012-07-11 01:31:05 +0200 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-07-12 09:13:22 +0200 |
commit | 44a8bdea19dff1abcdc4528e5f7e038b18ee5255 (patch) | |
tree | 25a923eecd8f9bc2674c305053f7b22cb21b90ee /mm/slob.c | |
parent | mm, slub: ensure irqs are enabled for kmemcheck (diff) | |
download | linux-44a8bdea19dff1abcdc4528e5f7e038b18ee5255.tar.xz linux-44a8bdea19dff1abcdc4528e5f7e038b18ee5255.zip |
slob: Fix early boot kernel crash
Commit fd3142a59af2012a7c5dc72ec97a4935ff1c5fc6 broke
slob since a piece of a change for a later patch slipped into
it.
Fengguang Wu writes:
The commit crashes the kernel w/o any dmesg output (the attached one is
created by the script as a summary for that run). This is very
reproducible in kvm for the attached config.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slob.c')
-rw-r--r-- | mm/slob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c index 0111e0dece93..45d4ca79933a 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -518,7 +518,7 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size, if (c) { c->name = name; - c->size = c->object_size; + c->size = size; if (flags & SLAB_DESTROY_BY_RCU) { /* leave room for rcu footer at the end of object */ c->size += sizeof(struct slob_rcu); |