aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-22 10:08:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-22 10:08:52 -0700
commitbc584c5107bfd97e2aa41c798e3b213bcdd4eae7 (patch)
tree13cb518e2f4f2aac46aefbbaacb6e4fa3fbb58a2 /mm
parenta28e0852d45e65d9edf249c36e432b5e0a80f01d (diff)
parent1ab335d8f85792e3b107ff8237d53cf64db714df (diff)
downloadmrst-s0i3-test-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.tar.gz
mrst-s0i3-test-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.tar.xz
mrst-s0i3-test-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slab: fix object alignment slub: add missing __percpu markup in mm/slub_def.h
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 88435fcc838..fcae9815d3b 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2330,8 +2330,8 @@ 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->obj_size > cache_line_size() && size < PAGE_SIZE) {
- cachep->obj_offset += PAGE_SIZE - size;
+ && cachep->obj_size > cache_line_size() && ALIGN(size, align) < PAGE_SIZE) {
+ cachep->obj_offset += PAGE_SIZE - ALIGN(size, align);
size = PAGE_SIZE;
}
#endif