Skip to contentSkip to conversation

tools: Adopt fls_long and deps

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Dec 18, 2014 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  afcd4f6235659c611f0e62236f6a7bc0ae08af1e
Gitweb:     http://git.kernel.org/tip/afcd4f6235659c611f0e62236f6a7bc0ae08af1e
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 16 Dec 2014 11:26:35 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 17 Dec 2014 11:58:08 -0300

tools: Adopt fls_long and deps

Will be used when adopting rounddown_pow_of_two.

Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[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]>
---
 tools/include/asm-generic/bitops.h       | 3 +++
 tools/include/asm-generic/bitops/__fls.h | 1 +
 tools/include/asm-generic/bitops/fls.h   | 1 +
 tools/include/asm-generic/bitops/fls64.h | 1 +
 tools/include/linux/bitops.h             | 7 +++++++
 tools/perf/MANIFEST                      | 6 ++++++
 tools/perf/Makefile.perf                 | 3 +++
 7 files changed, 22 insertions(+)
tools/include/asm-generic/bitops.h +3 -0
index 6dfd9d5..6eedba1 100644
@@ -13,6 +13,9 @@
  */
 
 #include <asm-generic/bitops/__ffs.h>
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
+#include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/find.h>
 
 #ifndef _TOOLS_LINUX_BITOPS_H_
tools/include/asm-generic/bitops/__fls.h new file +1 -0
new file mode 100644
index 0000000..2218b9a
@@ -0,0 +1 @@
+#include <../../../../include/asm-generic/bitops/__fls.h>
tools/include/asm-generic/bitops/fls.h new file +1 -0
new file mode 100644
index 0000000..dbf711a
@@ -0,0 +1 @@
+#include <../../../../include/asm-generic/bitops/fls.h>
tools/include/asm-generic/bitops/fls64.h new file +1 -0
new file mode 100644
index 0000000..980b1f6
@@ -0,0 +1 @@
+#include <../../../../include/asm-generic/bitops/fls64.h>
tools/include/linux/bitops.h +7 -0
index 5237bc9..26005a15 100644
@@ -43,4 +43,11 @@ static inline unsigned long hweight_long(unsigned long w)
 	return sizeof(w) == 4 ? hweight32(w) : hweight64(w);
 }
 
+static inline unsigned fls_long(unsigned long l)
+{
+	if (sizeof(l) == 4)
+		return fls(l);
+	return fls64(l);
+}
+
 #endif
tools/perf/MANIFEST +6 -0
index 7729af9..83e2887 100644
@@ -8,7 +8,10 @@ tools/lib/util/find_next_bit.c
 tools/include/asm/bug.h
 tools/include/asm-generic/bitops/atomic.h
 tools/include/asm-generic/bitops/__ffs.h
+tools/include/asm-generic/bitops/__fls.h
 tools/include/asm-generic/bitops/find.h
+tools/include/asm-generic/bitops/fls64.h
+tools/include/asm-generic/bitops/fls.h
 tools/include/asm-generic/bitops.h
 tools/include/linux/bitops.h
 tools/include/linux/compiler.h

@@ -16,6 +19,9 @@ tools/include/linux/export.h
 tools/include/linux/hash.h
 tools/include/linux/log2.h
 tools/include/linux/types.h
+include/asm-generic/bitops/fls64.h
+include/asm-generic/bitops/__fls.h
+include/asm-generic/bitops/fls.h
 include/linux/const.h
 include/linux/perf_event.h
 include/linux/rbtree.h
tools/perf/Makefile.perf +3 -0
index 28e590e..67a03a82 100644
@@ -234,7 +234,10 @@ LIB_H += util/include/linux/bitmap.h
 LIB_H += ../include/linux/bitops.h
 LIB_H += ../include/asm-generic/bitops/atomic.h
 LIB_H += ../include/asm-generic/bitops/find.h
+LIB_H += ../include/asm-generic/bitops/fls64.h
+LIB_H += ../include/asm-generic/bitops/fls.h
 LIB_H += ../include/asm-generic/bitops/__ffs.h
+LIB_H += ../include/asm-generic/bitops/__fls.h
 LIB_H += ../include/asm-generic/bitops.h
 LIB_H += ../include/linux/compiler.h
 LIB_H += ../include/linux/log2.h