diff options
author | 2021-05-18 09:45:08 +0300 | |
---|---|---|
committer | 2021-05-18 09:45:08 +0300 | |
commit | 85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34 (patch) | |
tree | dc6b176404218efac28a4a1a0c240cb36f1e9173 /lib/genalloc.c | |
parent | Merge branch 'omap-for-v5.13/ti-sysc' into fixes (diff) | |
parent | ARM: OMAP2+: Fix build warning when mmc_omap is not built (diff) | |
download | wireguard-linux-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.tar.xz wireguard-linux-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.zip |
Merge branch 'fixes-rc1' into fixes
Diffstat (limited to 'lib/genalloc.c')
-rw-r--r-- | lib/genalloc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/genalloc.c b/lib/genalloc.c index 5dcf9cdcbc46..9a57257988c7 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -642,6 +642,7 @@ EXPORT_SYMBOL(gen_pool_set_algo); * @nr: The number of zeroed bits we're looking for * @data: additional data - unused * @pool: pool to find the fit region memory from + * @start_addr: not used in this function */ unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size, unsigned long start, unsigned int nr, void *data, @@ -660,6 +661,7 @@ EXPORT_SYMBOL(gen_pool_first_fit); * @nr: The number of zeroed bits we're looking for * @data: data for alignment * @pool: pool to get order from + * @start_addr: start addr of alloction chunk */ unsigned long gen_pool_first_fit_align(unsigned long *map, unsigned long size, unsigned long start, unsigned int nr, void *data, @@ -687,6 +689,7 @@ EXPORT_SYMBOL(gen_pool_first_fit_align); * @nr: The number of zeroed bits we're looking for * @data: data for alignment * @pool: pool to get order from + * @start_addr: not used in this function */ unsigned long gen_pool_fixed_alloc(unsigned long *map, unsigned long size, unsigned long start, unsigned int nr, void *data, @@ -721,6 +724,7 @@ EXPORT_SYMBOL(gen_pool_fixed_alloc); * @nr: The number of zeroed bits we're looking for * @data: additional data - unused * @pool: pool to find the fit region memory from + * @start_addr: not used in this function */ unsigned long gen_pool_first_fit_order_align(unsigned long *map, unsigned long size, unsigned long start, @@ -735,13 +739,14 @@ EXPORT_SYMBOL(gen_pool_first_fit_order_align); /** * gen_pool_best_fit - find the best fitting region of memory - * macthing the size requirement (no alignment constraint) + * matching the size requirement (no alignment constraint) * @map: The address to base the search on * @size: The bitmap size in bits * @start: The bitnumber to start searching at * @nr: The number of zeroed bits we're looking for * @data: additional data - unused * @pool: pool to find the fit region memory from + * @start_addr: not used in this function * * Iterate over the bitmap to find the smallest free region * which we can allocate the memory. |