diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /include/linux/slab_def.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/slab_def.h')
| -rw-r--r-- | include/linux/slab_def.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index e9346b4f1ef4..09bfffb08a56 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h | |||
| @@ -27,8 +27,8 @@ struct kmem_cache { | |||
| 27 | 27 | ||
| 28 | size_t colour; /* cache colouring range */ | 28 | size_t colour; /* cache colouring range */ |
| 29 | unsigned int colour_off; /* colour offset */ | 29 | unsigned int colour_off; /* colour offset */ |
| 30 | struct kmem_cache *slabp_cache; | 30 | struct kmem_cache *freelist_cache; |
| 31 | unsigned int slab_size; | 31 | unsigned int freelist_size; |
| 32 | 32 | ||
| 33 | /* constructor func */ | 33 | /* constructor func */ |
| 34 | void (*ctor)(void *obj); | 34 | void (*ctor)(void *obj); |