diff --git a/[refs] b/[refs] index cd5d8f8343aa..fe8c806fa3dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 418508c13222ddba475873ea95c8aeadd26104f2 +refs/heads/master: 33e9e24101abac2bf3535d0d013d6d27d19197cb diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 0b0c2a3e76f7..3e5aefcb4075 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -939,7 +939,7 @@ static void kmem_cache_open_debug_check(struct kmem_cache *s) * Debugging or ctor may create a need to move the free * pointer. Fail if this happens. */ - if (s->size >= 65535 * sizeof(void *)) { + if (s->objsize >= 65535 * sizeof(void *)) { BUG_ON(s->flags & (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | SLAB_DESTROY_BY_RCU)); BUG_ON(s->ctor);