diff options
Diffstat (limited to 'mm/slab_common.c')
-rw-r--r-- | mm/slab_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 8f7f9f75d7ea..175e86637afd 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c | |||
@@ -291,7 +291,7 @@ int slab_unmergeable(struct kmem_cache *s) | |||
291 | } | 291 | } |
292 | 292 | ||
293 | struct kmem_cache *find_mergeable(size_t size, size_t align, | 293 | struct kmem_cache *find_mergeable(size_t size, size_t align, |
294 | unsigned long flags, const char *name, void (*ctor)(void *)) | 294 | slab_flags_t flags, const char *name, void (*ctor)(void *)) |
295 | { | 295 | { |
296 | struct kmem_cache *s; | 296 | struct kmem_cache *s; |
297 | 297 | ||
@@ -341,7 +341,7 @@ struct kmem_cache *find_mergeable(size_t size, size_t align, | |||
341 | * Figure out what the alignment of the objects will be given a set of | 341 | * Figure out what the alignment of the objects will be given a set of |
342 | * flags, a user specified alignment and the size of the objects. | 342 | * flags, a user specified alignment and the size of the objects. |
343 | */ | 343 | */ |
344 | unsigned long calculate_alignment(unsigned long flags, | 344 | unsigned long calculate_alignment(slab_flags_t flags, |
345 | unsigned long align, unsigned long size) | 345 | unsigned long align, unsigned long size) |
346 | { | 346 | { |
347 | /* | 347 | /* |
@@ -366,7 +366,7 @@ unsigned long calculate_alignment(unsigned long flags, | |||
366 | 366 | ||
367 | static struct kmem_cache *create_cache(const char *name, | 367 | static struct kmem_cache *create_cache(const char *name, |
368 | size_t object_size, size_t size, size_t align, | 368 | size_t object_size, size_t size, size_t align, |
369 | unsigned long flags, void (*ctor)(void *), | 369 | slab_flags_t flags, void (*ctor)(void *), |
370 | struct mem_cgroup *memcg, struct kmem_cache *root_cache) | 370 | struct mem_cgroup *memcg, struct kmem_cache *root_cache) |
371 | { | 371 | { |
372 | struct kmem_cache *s; | 372 | struct kmem_cache *s; |
@@ -431,7 +431,7 @@ out_free_cache: | |||
431 | */ | 431 | */ |
432 | struct kmem_cache * | 432 | struct kmem_cache * |
433 | kmem_cache_create(const char *name, size_t size, size_t align, | 433 | kmem_cache_create(const char *name, size_t size, size_t align, |
434 | unsigned long flags, void (*ctor)(void *)) | 434 | slab_flags_t flags, void (*ctor)(void *)) |
435 | { | 435 | { |
436 | struct kmem_cache *s = NULL; | 436 | struct kmem_cache *s = NULL; |
437 | const char *cache_name; | 437 | const char *cache_name; |
@@ -879,7 +879,7 @@ bool slab_is_available(void) | |||
879 | #ifndef CONFIG_SLOB | 879 | #ifndef CONFIG_SLOB |
880 | /* Create a cache during boot when no slab services are available yet */ | 880 | /* Create a cache during boot when no slab services are available yet */ |
881 | void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t size, | 881 | void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t size, |
882 | unsigned long flags) | 882 | slab_flags_t flags) |
883 | { | 883 | { |
884 | int err; | 884 | int err; |
885 | 885 | ||
@@ -899,7 +899,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz | |||
899 | } | 899 | } |
900 | 900 | ||
901 | struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, | 901 | struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, |
902 | unsigned long flags) | 902 | slab_flags_t flags) |
903 | { | 903 | { |
904 | struct kmem_cache *s = kmem_cache_zalloc(kmem_cache, GFP_NOWAIT); | 904 | struct kmem_cache *s = kmem_cache_zalloc(kmem_cache, GFP_NOWAIT); |
905 | 905 | ||
@@ -1057,7 +1057,7 @@ void __init setup_kmalloc_cache_index_table(void) | |||
1057 | } | 1057 | } |
1058 | } | 1058 | } |
1059 | 1059 | ||
1060 | static void __init new_kmalloc_cache(int idx, unsigned long flags) | 1060 | static void __init new_kmalloc_cache(int idx, slab_flags_t flags) |
1061 | { | 1061 | { |
1062 | kmalloc_caches[idx] = create_kmalloc_cache(kmalloc_info[idx].name, | 1062 | kmalloc_caches[idx] = create_kmalloc_cache(kmalloc_info[idx].name, |
1063 | kmalloc_info[idx].size, flags); | 1063 | kmalloc_info[idx].size, flags); |
@@ -1068,7 +1068,7 @@ static void __init new_kmalloc_cache(int idx, unsigned long flags) | |||
1068 | * may already have been created because they were needed to | 1068 | * may already have been created because they were needed to |
1069 | * enable allocations for slab creation. | 1069 | * enable allocations for slab creation. |
1070 | */ | 1070 | */ |
1071 | void __init create_kmalloc_caches(unsigned long flags) | 1071 | void __init create_kmalloc_caches(slab_flags_t flags) |
1072 | { | 1072 | { |
1073 | int i; | 1073 | int i; |
1074 | 1074 | ||