aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2012-09-30 04:28:25 -0400
committerPekka Enberg <penberg@kernel.org>2012-10-03 02:53:34 -0400
commit608da7e3fc7259eca0d983b31bc8915af14cf15e (patch)
tree16ee40aa4a503edb45af10b6aedb7cb1d7a5cd5c
parent788e1aadadd0d5a9cbffce10c34840b4072bc733 (diff)
slab: Fix build failure in __kmem_cache_create()
Fix build failure with CONFIG_DEBUG_SLAB=y && CONFIG_DEBUG_PAGEALLOC=y caused by commit 8a13a4cc "mm/sl[aou]b: Shrink __kmem_cache_create() parameter lists". mm/slab.c: In function '__kmem_cache_create': mm/slab.c:2474: error: 'align' undeclared (first use in this function) mm/slab.c:2474: error: (Each undeclared identifier is reported only once mm/slab.c:2474: error: for each function it appears in.) make[1]: *** [mm/slab.o] Error 1 make: *** [mm] Error 2 Acked-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Pekka Enberg <penberg@kernel.org>
-rw-r--r--mm/slab.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c
index d011030e9613..c4f6e14c2c71 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2492,8 +2492,9 @@ __kmem_cache_create (const char *name, size_t size, size_t align,
2492 } 2492 }
2493#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC) 2493#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)
2494 if (size >= malloc_sizes[INDEX_L3 + 1].cs_size 2494 if (size >= malloc_sizes[INDEX_L3 + 1].cs_size
2495 && cachep->object_size > cache_line_size() && ALIGN(size, align) < PAGE_SIZE) { 2495 && cachep->object_size > cache_line_size()
2496 cachep->obj_offset += PAGE_SIZE - ALIGN(size, align); 2496 && ALIGN(size, cachep->align) < PAGE_SIZE) {
2497 cachep->obj_offset += PAGE_SIZE - ALIGN(size, cachep->align);
2497 size = PAGE_SIZE; 2498 size = PAGE_SIZE;
2498 } 2499 }
2499#endif 2500#endif