Commit 0be70327 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

slab: make kmalloc_size() return "unsigned int"

kmalloc_size() derives size of kmalloc cache from internal index, which
can't be negative.

Propagate unsignedness a bit.

Link: http://lkml.kernel.org/r/20180305200730.15812-3-adobriyan@gmail.comSigned-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36071a27
...@@ -522,11 +522,11 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) ...@@ -522,11 +522,11 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
* return size or 0 if a kmalloc cache for that * return size or 0 if a kmalloc cache for that
* size does not exist * size does not exist
*/ */
static __always_inline int kmalloc_size(int n) static __always_inline unsigned int kmalloc_size(unsigned int n)
{ {
#ifndef CONFIG_SLOB #ifndef CONFIG_SLOB
if (n > 2) if (n > 2)
return 1 << n; return 1U << n;
if (n == 1 && KMALLOC_MIN_SIZE <= 32) if (n == 1 && KMALLOC_MIN_SIZE <= 32)
return 96; return 96;
......
...@@ -1138,9 +1138,9 @@ void __init create_kmalloc_caches(slab_flags_t flags) ...@@ -1138,9 +1138,9 @@ void __init create_kmalloc_caches(slab_flags_t flags)
struct kmem_cache *s = kmalloc_caches[i]; struct kmem_cache *s = kmalloc_caches[i];
if (s) { if (s) {
int size = kmalloc_size(i); unsigned int size = kmalloc_size(i);
char *n = kasprintf(GFP_NOWAIT, char *n = kasprintf(GFP_NOWAIT,
"dma-kmalloc-%d", size); "dma-kmalloc-%u", size);
BUG_ON(!n); BUG_ON(!n);
kmalloc_dma_caches[i] = create_kmalloc_cache(n, kmalloc_dma_caches[i] = create_kmalloc_cache(n,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment