diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-22 10:08:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-22 10:08:52 -0700 |
| commit | bc584c5107bfd97e2aa41c798e3b213bcdd4eae7 (patch) | |
| tree | 13cb518e2f4f2aac46aefbbaacb6e4fa3fbb58a2 | |
| parent | a28e0852d45e65d9edf249c36e432b5e0a80f01d (diff) | |
| parent | 1ab335d8f85792e3b107ff8237d53cf64db714df (diff) | |
| download | op-kernel-dev-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.zip op-kernel-dev-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.tar.gz | |
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
| -rw-r--r-- | include/linux/slub_def.h | 2 | ||||
| -rw-r--r-- | mm/slab.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 6d14409..9f63538 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -68,7 +68,7 @@ struct kmem_cache_order_objects { * Slab cache management. */ struct kmem_cache { - struct kmem_cache_cpu *cpu_slab; + struct kmem_cache_cpu __percpu *cpu_slab; /* Used for retriving partial slabs etc */ unsigned long flags; int size; /* The size of an object including meta data */ @@ -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 |
