diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-08-23 05:44:03 +0400 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2010-08-23 05:44:03 +0400 |
| commit | 2809234de11df83803f6d81a84828c3805b0f206 (patch) | |
| tree | c07b2903f6f8d3cc194507ed9e78f1044824249a /include/linux | |
| parent | 2c1179afc3bc92a2db930a085fee33214bd886e3 (diff) | |
| parent | 76be97c1fc945db08aae1f1b746012662d643e97 (diff) | |
| download | linux-2809234de11df83803f6d81a84828c3805b0f206.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux')
| -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 */ |