Skip to contentSkip to conversation

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

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 10, 2015

Subsystems (3)
Library code perf events Bitops API
lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  0aefc3590afcc9ecbe173fc01fccbda0869d2f0a
Gitweb:     http://git.kernel.org/tip/0aefc3590afcc9ecbe173fc01fccbda0869d2f0a
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 9 Jul 2015 16:27:25 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 9 Jul 2015 16:29:56 -0300

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 <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Stephane Eranian <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 {lib => tools/lib}/hweight.c       | 5 -----
 tools/perf/MANIFEST                | 2 +-
 tools/perf/util/Build              | 2 +-
 tools/perf/util/python-ext-sources | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)
tools/lib/hweight.c renamed from lib/hweight.c +0 -5
similarity index 92%
copy from lib/hweight.c
copy to tools/lib/hweight.c
index 9a5c1f2..0b859b8 100644
@@ -1,4 +1,3 @@
-#include <linux/export.h>
 #include <linux/bitops.h>
 #include <asm/types.h>
 

@@ -24,7 +23,6 @@ unsigned int __sw_hweight32(unsigned int w)
 	return (res + (res >> 16)) & 0x000000FF;
 #endif
 }
-EXPORT_SYMBOL(__sw_hweight32);
 
 unsigned int __sw_hweight16(unsigned int w)
 {

@@ -33,7 +31,6 @@ unsigned int __sw_hweight16(unsigned int w)
 	res = (res + (res >> 4)) & 0x0F0F;
 	return (res + (res >> 8)) & 0x00FF;
 }
-EXPORT_SYMBOL(__sw_hweight16);
 
 unsigned int __sw_hweight8(unsigned int w)
 {

@@ -41,7 +38,6 @@ unsigned int __sw_hweight8(unsigned int w)
 	res = (res & 0x33) + ((res >> 2) & 0x33);
 	return (res + (res >> 4)) & 0x0F;
 }
-EXPORT_SYMBOL(__sw_hweight8);
 
 unsigned long __sw_hweight64(__u64 w)
 {

@@ -64,4 +60,3 @@ unsigned long __sw_hweight64(__u64 w)
 #endif
 #endif
 }
-EXPORT_SYMBOL(__sw_hweight64);
tools/perf/MANIFEST +1 -1
index 09dc0aa..d01a0aa 100644
@@ -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
index 601d114..d2d318c 100644
@@ -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
index de05e04..0766d98 100644
@@ -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