Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a451d9 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free() 



commit c42b65e363ce97a828f81b59033c3558f8fa7f70 upstream.

A lot of code become ugly because of open coding allocations for bitmaps.

Introduce three helpers to allow users be more clear of intention
and keep their code neat.

Note, due to multiple circular dependencies we may not provide
the helpers as inliners. For now we keep them exported and, perhaps,
at some point in the future we will sort out header inclusion and
inheritance.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b5475640

include/linux/bitmap.h

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,14 @@ 
 * contain all bit positions from 0 to 'bits' - 1.

 */



/*

 * Allocation and deallocation of bitmap.

 * Provided in lib/bitmap.c to avoid circular dependency.

 */

extern unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags);

extern unsigned long *bitmap_zalloc(unsigned int nbits, gfp_t flags);

extern void bitmap_free(const unsigned long *bitmap);



/*

 * lib/bitmap.c provides these functions:

 */

lib/bitmap.c

+20 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/bitops.h>

#include <linux/bug.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/uaccess.h>
@@ -1212,3 +1213,22 @@ void bitmap_copy_le(unsigned long *dst, const unsigned long *src, unsigned int n 
}

EXPORT_SYMBOL(bitmap_copy_le);

#endif



unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags)

{

	return kmalloc_array(BITS_TO_LONGS(nbits), sizeof(unsigned long),

			     flags);

}

EXPORT_SYMBOL(bitmap_alloc);



unsigned long *bitmap_zalloc(unsigned int nbits, gfp_t flags)

{

	return bitmap_alloc(nbits, flags | __GFP_ZERO);

}

EXPORT_SYMBOL(bitmap_zalloc);



void bitmap_free(const unsigned long *bitmap)

{

	kfree(bitmap);

}

EXPORT_SYMBOL(bitmap_free);