diff options
author | 2021-04-29 21:45:19 +0200 | |
---|---|---|
committer | 2021-04-29 21:45:19 +0200 | |
commit | e50fedec822efc7b7090f95862b782d91ca8aec0 (patch) | |
tree | 22dd6b534d00a1f7fc3823f0d88e0d43547fc87b /lib/genalloc.c | |
parent | Merge branch 'for-5.13/plantronics' into for-linus (diff) | |
parent | HID: surface-hid: Add support for legacy keyboard interface (diff) | |
download | wireguard-linux-e50fedec822efc7b7090f95862b782d91ca8aec0.tar.xz wireguard-linux-e50fedec822efc7b7090f95862b782d91ca8aec0.zip |
Merge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus
- Surface Aggregator Module support from Maximilian Luz
Diffstat (limited to 'lib/genalloc.c')
-rw-r--r-- | lib/genalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/genalloc.c b/lib/genalloc.c index dab97bb69df6..5dcf9cdcbc46 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; |