History

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

Linus Torvalds committed 16 years ago

Commit bc584c52 parents a28e085 1ab335d2 files · +3 −3Browse files

Showing the changes to include (1 of 2 files). Show all

Unified · Split

include/linux/slub_def.h+1−1
@@ -68,7 +68,7 @@ struct kmem_cache_order_objects { · 67 unmodified lines
6868 * Slab cache management.
6969 */
7070 struct kmem_cache {
71− struct kmem_cache_cpu *cpu_slab;
71+ struct kmem_cache_cpu __percpu *cpu_slab;
7272 /* Used for retriving partial slabs etc */
7373 unsigned long flags;
7474 int size; /* The size of an object including meta data */