From: Minchan Kim Date: Wed, 6 Aug 2014 23:08:29 +0000 (-0700) Subject: zram: use size_t instead of u16 X-Git-Tag: firefly_0821_release~3680^2~8^2^2~20 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=244e41f94febd73d877a397a05e626563ebd2ceb;p=firefly-linux-kernel-4.4.55.git zram: use size_t instead of u16 Some architectures (eg, hexagon and PowerPC) could use PAGE_SHIFT of 16 or more. In these cases u16 is not sufficiently large to represent a compressed page's size so use size_t. Signed-off-by: Minchan Kim Reported-by: Weijie Yang Acked-by: Sergey Senozhatsky Cc: Jerome Marchand Cc: Nitin Gupta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit 023b409f9dac4cdea3322009f2e592068558690c) Signed-off-by: Alex Shi --- diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 674b8517694d..efd9e4f1605c 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -336,7 +336,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) unsigned char *cmem; struct zram_meta *meta = zram->meta; unsigned long handle; - u16 size; + size_t size; read_lock(&meta->tb_lock); handle = meta->table[index].handle;