diff options
| author | Pekka Enberg <penberg@kernel.org> | 2013-11-11 11:09:00 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2013-11-11 11:09:00 -0500 |
| commit | ea982d9ffdfaa22552e9b0b9be94f459afa36102 (patch) | |
| tree | d3f3c3d9e43f4bc616b0c7156b54b3760b48f60e /include/linux/slab_def.h | |
| parent | d56791b38e34e480d869d1b88735df16c81aa684 (diff) | |
| parent | 7e00735520ffb00bda3e08c441d0a4dba42913a7 (diff) | |
Merge branch 'slab/struct-page' into slab/next
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 cd401580bdd3..ca82e8ff89fa 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h | |||
| @@ -41,8 +41,8 @@ struct kmem_cache { | |||
| 41 | 41 | ||
| 42 | size_t colour; /* cache colouring range */ | 42 | size_t colour; /* cache colouring range */ |
| 43 | unsigned int colour_off; /* colour offset */ | 43 | unsigned int colour_off; /* colour offset */ |
| 44 | struct kmem_cache *slabp_cache; | 44 | struct kmem_cache *freelist_cache; |
| 45 | unsigned int slab_size; | 45 | unsigned int freelist_size; |
| 46 | 46 | ||
| 47 | /* constructor func */ | 47 | /* constructor func */ |
| 48 | void (*ctor)(void *obj); | 48 | void (*ctor)(void *obj); |