UPSTREAM: mm/zsmalloc.c: change stat type parameter to int
authorMatthias Kaehlcke <mka@chromium.org>
Fri, 8 Sep 2017 23:13:02 +0000 (16:13 -0700)
committerMichael Benedict <michaelbt@live.com>
Sat, 31 Aug 2019 15:08:51 +0000 (01:08 +1000)
zs_stat_inc/dec/get() uses enum zs_stat_type for the stat type, however
some callers pass an enum fullness_group value.  Change the type to int to
reflect the actual use of the functions and get rid of 'enum-conversion'
warnings

Link: http://lkml.kernel.org/r/20170731175000.56538-1-mka@chromium.org
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Doug Anderson <dianders@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 3eb95feac113d8ebad5b7b5189a65efcbd95a749)
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
mm/zsmalloc.c

index a9d802b3b28937b281a9440abc4932a990bae92c..a5ad4dab4ab8f33c3fdfcf9693d6cfe00e9b042b 100644 (file)
@@ -576,20 +576,23 @@ static int get_size_class_index(int size)
        return min(zs_size_classes - 1, idx);
 }
 
+/* type can be of enum type zs_stat_type or fullness_group */
 static inline void zs_stat_inc(struct size_class *class,
-                               enum zs_stat_type type, unsigned long cnt)
+                               int type, unsigned long cnt)
 {
        class->stats.objs[type] += cnt;
 }
 
+/* type can be of enum type zs_stat_type or fullness_group */
 static inline void zs_stat_dec(struct size_class *class,
-                               enum zs_stat_type type, unsigned long cnt)
+                               int type, unsigned long cnt)
 {
        class->stats.objs[type] -= cnt;
 }
 
+/* type can be of enum type zs_stat_type or fullness_group */
 static inline unsigned long zs_stat_get(struct size_class *class,
-                               enum zs_stat_type type)
+                               int type)
 {
        return class->stats.objs[type];
 }