summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parenta28e0852d45e65d9edf249c36e432b5e0a80f01d (diff)
parent1ab335d8f85792e3b107ff8237d53cf64db714df (diff)
downloadlinux-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.tar.bz2
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.h2
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 */