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

Commit 850f8127 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add bitmap_or function into bitmap object 

Adding implementation os bitmap_or function to the bitmap object. It is
stolen from the kernel lib/bitmap.o object.

It is used in upcomming patches.

Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1327674868-10486-5-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e90fda06

tools/perf/util/bitmap.c

+10 −0
Original line number Diff line number Diff line
@@ -19,3 +19,13 @@ int __bitmap_weight(const unsigned long *bitmap, int bits) 


	return w;

}



void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, int bits)

{

	int k;

	int nr = BITS_TO_LONGS(bits);



	for (k = 0; k < nr; k++)

		dst[k] = bitmap1[k] | bitmap2[k];

}

tools/perf/util/include/linux/bitmap.h

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <linux/bitops.h>



int __bitmap_weight(const unsigned long *bitmap, int bits);

void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, int bits);



#define BITMAP_LAST_WORD_MASK(nbits)					\

(									\
@@ -32,4 +34,13 @@ static inline int bitmap_weight(const unsigned long *src, int nbits) 
	return __bitmap_weight(src, nbits);

}



static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,

			     const unsigned long *src2, int nbits)

{

	if (small_const_nbits(nbits))

		*dst = *src1 | *src2;

	else

		__bitmap_or(dst, src1, src2, nbits);

}



#endif /* _PERF_BITOPS_H */