diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-22 19:08:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-22 19:08:52 +0200 |
| commit | bc584c5107bfd97e2aa41c798e3b213bcdd4eae7 (patch) | |
| tree | 13cb518e2f4f2aac46aefbbaacb6e4fa3fbb58a2 /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| parent | slab: fix object alignment (diff) | |
| download | linux-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.tar.xz linux-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 'include')
| -rw-r--r-- | include/linux/slub_def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 6d14409c4d9a..9f63538928c0 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 */ |