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

Commit b26ad583 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

lib/bitmap.c: change parameters of bitmap_fold to unsigned 



Change the sz and nbits parameters of bitmap_fold to unsigned int for
consistency with other bitmap_* functions, and to save another few bytes
in the generated code.

[akpm@linux-foundation.org: fix kerneldoc]
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eb569883

include/linux/bitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ extern int bitmap_bitremap(int oldbit, 
extern void bitmap_onto(unsigned long *dst, const unsigned long *orig,

		const unsigned long *relmap, unsigned int bits);

extern void bitmap_fold(unsigned long *dst, const unsigned long *orig,

		int sz, int bits);

		unsigned int sz, unsigned int nbits);

extern int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order);

extern void bitmap_release_region(unsigned long *bitmap, unsigned int pos, int order);

extern int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order);

lib/bitmap.c

+5 −5
Original line number Diff line number Diff line
@@ -1039,22 +1039,22 @@ EXPORT_SYMBOL(bitmap_onto); 
 *	@dst: resulting smaller bitmap

 *	@orig: original larger bitmap

 *	@sz: specified size

 *	@bits: number of bits in each of these bitmaps

 *	@nbits: number of bits in each of these bitmaps

 *

 * For each bit oldbit in @orig, set bit oldbit mod @sz in @dst.

 * Clear all other bits in @dst.  See further the comment and

 * Example [2] for bitmap_onto() for why and how to use this.

 */

void bitmap_fold(unsigned long *dst, const unsigned long *orig,

			int sz, int bits)

			unsigned int sz, unsigned int nbits)

{

	int oldbit;

	unsigned int oldbit;



	if (dst == orig)	/* following doesn't handle inplace mappings */

		return;

	bitmap_zero(dst, bits);

	bitmap_zero(dst, nbits);



	for_each_set_bit(oldbit, orig, bits)

	for_each_set_bit(oldbit, orig, nbits)

		set_bit(oldbit % sz, dst);

}

EXPORT_SYMBOL(bitmap_fold);