From: Huang Shijie <sjhuang@iluvatar.ai>
Date: Fri, 26 Feb 2021 01:21:17 +0000 (-0800)
Subject: lib/genalloc.c: change return type to unsigned long for bitmap_set_ll
X-Git-Tag: baikal/aarch64/sdk6.1~7118^2~26
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=2a73934c2106101f67378ba2bdde5dbe9c8cbe5d;p=kernel.git

lib/genalloc.c: change return type to unsigned long for bitmap_set_ll

Just as bitmap_clear_ll(), change return type to unsigned long
for bitmap_set_ll to avoid the possible overflow in future.

Link: https://lkml.kernel.org/r/20210105031644.2771-1-sjhuang@iluvatar.ai
Signed-off-by: Huang Shijie <sjhuang@iluvatar.ai>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/lib/genalloc.c b/lib/genalloc.c
index dab97bb69df63..5dcf9cdcbc46d 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -81,7 +81,8 @@ static int clear_bits_ll(unsigned long *addr, unsigned long mask_to_clear)
  * users set the same bit, one user will return remain bits, otherwise
  * return 0.
  */
-static int bitmap_set_ll(unsigned long *map, unsigned long start, unsigned long nr)
+static unsigned long
+bitmap_set_ll(unsigned long *map, unsigned long start, unsigned long nr)
 {
 	unsigned long *p = map + BIT_WORD(start);
 	const unsigned long size = start + nr;