From e07683da8ea14e75e19e80e34b3b20587d133809 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Sun, 30 Sep 2012 17:28:25 +0900 Subject: [PATCH] --- yaml --- r: 330429 b: refs/heads/master c: 608da7e3fc7259eca0d983b31bc8915af14cf15e h: refs/heads/master i: 330427: e789b14d451de487c7c771ef67f0e9f9818d4d3e v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5e1425ba069c..7dd6c3fa619a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 788e1aadadd0d5a9cbffce10c34840b4072bc733 +refs/heads/master: 608da7e3fc7259eca0d983b31bc8915af14cf15e diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index d011030e9613..c4f6e14c2c71 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -2492,8 +2492,9 @@ __kmem_cache_create (const char *name, size_t size, size_t align, } #if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC) if (size >= malloc_sizes[INDEX_L3 + 1].cs_size - && cachep->object_size > cache_line_size() && ALIGN(size, align) < PAGE_SIZE) { - cachep->obj_offset += PAGE_SIZE - ALIGN(size, align); + && cachep->object_size > cache_line_size() + && ALIGN(size, cachep->align) < PAGE_SIZE) { + cachep->obj_offset += PAGE_SIZE - ALIGN(size, cachep->align); size = PAGE_SIZE; } #endif