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

Commit 0aefc359 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools: Copy lib/hweight.c from the kernel sources 

Instead of accessing it directly, as it uses EXPORT_SYMBOL, that has
no meaning in tools/perf and because we removed the stubs for it, i.e.
we removed the tools/include/linux/export.h file.

This fixes the build for the detached tarball sources cases and removes
one more source of entanglement with the kernel sources.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-oyqx541o7apa2cskjhcxi6nx@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f3efe3a0

tools/lib/hweight.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
#include <linux/bitops.h>

#include <asm/types.h>



/**

 * hweightN - returns the hamming weight of a N-bit word

 * @x: the word to weigh

 *

 * The Hamming Weight of a number is the total number of bits set in it.

 */



unsigned int __sw_hweight32(unsigned int w)

{

#ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER

	w -= (w >> 1) & 0x55555555;

	w =  (w & 0x33333333) + ((w >> 2) & 0x33333333);

	w =  (w + (w >> 4)) & 0x0f0f0f0f;

	return (w * 0x01010101) >> 24;

#else

	unsigned int res = w - ((w >> 1) & 0x55555555);

	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);

	res = (res + (res >> 4)) & 0x0F0F0F0F;

	res = res + (res >> 8);

	return (res + (res >> 16)) & 0x000000FF;

#endif

}



unsigned int __sw_hweight16(unsigned int w)

{

	unsigned int res = w - ((w >> 1) & 0x5555);

	res = (res & 0x3333) + ((res >> 2) & 0x3333);

	res = (res + (res >> 4)) & 0x0F0F;

	return (res + (res >> 8)) & 0x00FF;

}



unsigned int __sw_hweight8(unsigned int w)

{

	unsigned int res = w - ((w >> 1) & 0x55);

	res = (res & 0x33) + ((res >> 2) & 0x33);

	return (res + (res >> 4)) & 0x0F;

}



unsigned long __sw_hweight64(__u64 w)

{

#if BITS_PER_LONG == 32

	return __sw_hweight32((unsigned int)(w >> 32)) +

	       __sw_hweight32((unsigned int)w);

#elif BITS_PER_LONG == 64

#ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER

	w -= (w >> 1) & 0x5555555555555555ul;

	w =  (w & 0x3333333333333333ul) + ((w >> 2) & 0x3333333333333333ul);

	w =  (w + (w >> 4)) & 0x0f0f0f0f0f0f0f0ful;

	return (w * 0x0101010101010101ul) >> 56;

#else

	__u64 res = w - ((w >> 1) & 0x5555555555555555ul);

	res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);

	res = (res + (res >> 4)) & 0x0F0F0F0F0F0F0F0Ful;

	res = res + (res >> 8);

	res = res + (res >> 16);

	return (res + (res >> 32)) & 0x00000000000000FFul;

#endif

#endif

}

tools/perf/MANIFEST

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ tools/arch/x86/include/asm/atomic.h 
tools/arch/x86/include/asm/rmwcc.h

tools/lib/traceevent

tools/lib/api

tools/lib/hweight.c

tools/lib/rbtree.c

tools/lib/symbol/kallsyms.c

tools/lib/symbol/kallsyms.h
@@ -57,7 +58,6 @@ include/linux/perf_event.h 
include/linux/list.h

include/linux/hash.h

include/linux/stringify.h

lib/hweight.c

include/linux/swab.h

arch/*/include/asm/unistd*.h

arch/*/include/uapi/asm/unistd*.h

tools/perf/util/Build

+1 −1
Original line number Diff line number Diff line
@@ -143,6 +143,6 @@ $(OUTPUT)util/rbtree.o: ../lib/rbtree.c FORCE 
	$(call rule_mkdir)

	$(call if_changed_dep,cc_o_c)



$(OUTPUT)util/hweight.o: ../../lib/hweight.c FORCE

$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE

	$(call rule_mkdir)

	$(call if_changed_dep,cc_o_c)

tools/perf/util/python-ext-sources

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ util/ctype.c 
util/evlist.c

util/evsel.c

util/cpumap.c

../../lib/hweight.c

../lib/hweight.c

util/thread_map.c

util/util.c

util/xyarray.c