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/[email protected]
Signed-off-by: Alexey Dobriyan <[email protected]>
Acked-by: Christoph Lameter <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 296f33a512eb424ccf4b71f8ede11b60e57332c5..ad157fbf38869d7a36e08647c29ceb29c01f7762 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -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
  * 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
        if (n > 2)
-               return 1 << n;
+               return 1U << n;
 
        if (n == 1 && KMALLOC_MIN_SIZE <= 32)
                return 96;

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 7626a64b8f14e1db4bd042e6f7080f39dfa262a5..d3f4209c297ddb7656a8a0328a622556193299e5 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -1138,9 +1138,9 @@ void __init create_kmalloc_caches(slab_flags_t flags)
                struct kmem_cache *s = kmalloc_caches[i];
 
                if (s) {
-                       int size = kmalloc_size(i);
+                       unsigned int size = kmalloc_size(i);
                        char *n = kasprintf(GFP_NOWAIT,
-                                "dma-kmalloc-%d", size);
+                                "dma-kmalloc-%u", size);
 
                        BUG_ON(!n);
                        kmalloc_dma_caches[i] = create_kmalloc_cache(n,