| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <tip-gubysnp4a8hd98lxoeruak13@git.kernel.org>
Date: Wed, 17 Dec 2014 22:29:35 -0800
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, dzickus@...hat.com,
peterz@...radead.org, adrian.hunter@...el.com, fweisbec@...il.com,
jolsa@...hat.com, hpa@...or.com, paulus@...ba.org,
mingo@...nel.org, tglx@...utronix.de, bp@...e.de, efault@....de,
eranian@...gle.com, dsahern@...il.com, namhyung@...nel.org,
acme@...hat.com
Subject: [tip:perf/urgent] tools: Move __ffs implementation to tools/
include/asm-generic/bitops/__ffs.h
Commit-ID: 2dc0b9721956f4314364f68a99d8bef490870438
Gitweb: http://git.kernel.org/tip/2dc0b9721956f4314364f68a99d8bef490870438
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Mon, 15 Dec 2014 15:07:24 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Wed, 17 Dec 2014 11:09:34 -0300
tools: Move __ffs implementation to tools/include/asm-generic/bitops/__ffs.h
To match the Linux kernel source code structure from where this code came from.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Borislav Petkov <bp@...e.de>
Cc: David Ahern <dsahern@...il.com>
Cc: Don Zickus <dzickus@...hat.com>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Mike Galbraith <efault@....de>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Link: http://lkml.kernel.org/n/tip-gubysnp4a8hd98lxoeruak13@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
.../include}/asm-generic/bitops/__ffs.h | 8 ++---
tools/perf/MANIFEST | 1 +
tools/perf/Makefile.perf | 1 +
tools/perf/util/include/linux/bitops.h | 37 +---------------------
4 files changed, 7 insertions(+), 40 deletions(-)
diff --git a/include/asm-generic/bitops/__ffs.h b/tools/include/asm-generic/bitops/__ffs.h
similarity index 77%
copy from include/asm-generic/bitops/__ffs.h
copy to tools/include/asm-generic/bitops/__ffs.h
index 937d7c4..c941750 100644
--- a/include/asm-generic/bitops/__ffs.h
+++ b/tools/include/asm-generic/bitops/__ffs.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_GENERIC_BITOPS___FFS_H_
-#define _ASM_GENERIC_BITOPS___FFS_H_
+#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_
+#define _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_
#include <asm/types.h>
@@ -13,7 +13,7 @@ static __always_inline unsigned long __ffs(unsigned long word)
{
int num = 0;
-#if BITS_PER_LONG == 64
+#if __BITS_PER_LONG == 64
if ((word & 0xffffffff) == 0) {
num += 32;
word >>= 32;
@@ -40,4 +40,4 @@ static __always_inline unsigned long __ffs(unsigned long word)
return num;
}
-#endif /* _ASM_GENERIC_BITOPS___FFS_H_ */
+#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_ */
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 344c4d3..39c0863 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -5,6 +5,7 @@ tools/lib/api
tools/lib/symbol/kallsyms.c
tools/lib/symbol/kallsyms.h
tools/include/asm/bug.h
+tools/include/asm-generic/bitops/__ffs.h
tools/include/linux/compiler.h
tools/include/linux/hash.h
tools/include/linux/export.h
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 763e68f..dbf8ca6 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -232,6 +232,7 @@ LIB_H += ../include/linux/hash.h
LIB_H += ../../include/linux/stringify.h
LIB_H += util/include/linux/bitmap.h
LIB_H += util/include/linux/bitops.h
+LIB_H += ../include/asm-generic/bitops/__ffs.h
LIB_H += ../include/linux/compiler.h
LIB_H += util/include/linux/const.h
LIB_H += util/include/linux/ctype.h
diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h
index c329416..762bb83 100644
--- a/tools/perf/util/include/linux/bitops.h
+++ b/tools/perf/util/include/linux/bitops.h
@@ -52,42 +52,7 @@ static inline unsigned long hweight_long(unsigned long w)
#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-/**
- * __ffs - find first bit in word.
- * @word: The word to search
- *
- * Undefined if no bit exists, so code should check against 0 first.
- */
-static __always_inline unsigned long __ffs(unsigned long word)
-{
- int num = 0;
-
-#if BITS_PER_LONG == 64
- if ((word & 0xffffffff) == 0) {
- num += 32;
- word >>= 32;
- }
-#endif
- if ((word & 0xffff) == 0) {
- num += 16;
- word >>= 16;
- }
- if ((word & 0xff) == 0) {
- num += 8;
- word >>= 8;
- }
- if ((word & 0xf) == 0) {
- num += 4;
- word >>= 4;
- }
- if ((word & 0x3) == 0) {
- num += 2;
- word >>= 2;
- }
- if ((word & 0x1) == 0)
- num += 1;
- return num;
-}
+#include <asm-generic/bitops/__ffs.h>
typedef const unsigned long __attribute__((__may_alias__)) long_alias_t;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists