summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-01-08 10:46:52 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-01-08 12:35:35 -0300
commit552eb975b83756e3d95aeb5edaeb5c3c032b0021 (patch)
tree4fb711b60f9525fe4fa53a6681eaa39cd517deff
parenta831e67913e356be63d5bb0509fc1af3c4e6ceb4 (diff)
tools lib: Move find_next_bit.c to tools/lib/
The commit that introduced it should've moved it to the same place, plus the 'tools/' prefix, but instead moved it to a bogus tools/lib/util/ directory, being the only file there. Move it to tools/lib/find_bit.c, picking the name for the file where these routines live since: 8f6f19dd5143 ("lib: move find_last_bit to lib/find_next_bit.c") Next step is to make tools/lib/find_bit.c to differ from lib/find_bit.c just in removing what is not used by tools/. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: David Ahern <dsahern@gmail.com> Cc: George Spelvin <linux@horizon.com Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Wang Nan <wangnan0@huawei.com> Cc: Yury Norov <yury.norov@gmail.com> Link: http://lkml.kernel.org/n/tip-p391cex5mqvahp4pwrton87n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/lib/find_bit.c (renamed from tools/lib/util/find_next_bit.c)2
-rw-r--r--tools/perf/MANIFEST2
-rw-r--r--tools/perf/util/Build6
-rw-r--r--tools/perf/util/python-ext-sources2
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/lib/util/find_next_bit.c b/tools/lib/find_bit.c
index 41b44f65a79e..732d8c38d2c3 100644
--- a/tools/lib/util/find_next_bit.c
+++ b/tools/lib/find_bit.c
@@ -1,6 +1,6 @@
/* find_next_bit.c: fallback find next bit implementation
*
- * Copied from lib/find_next_bit.c to tools/lib/next_bit.c
+ * Copied from lib/find_next_bit.c to tools/lib/find_bit.c
*
* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
* Written by David Howells (dhowells@redhat.com)
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index ce3932ee4893..b3db8dfebbf2 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -26,7 +26,7 @@ tools/lib/rbtree.c
tools/lib/string.c
tools/lib/symbol/kallsyms.c
tools/lib/symbol/kallsyms.h
-tools/lib/util/find_next_bit.c
+tools/lib/find_bit.c
tools/include/asm/atomic.h
tools/include/asm/barrier.h
tools/include/asm/bug.h
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 94b1099f2c22..e8bc10b41b66 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -9,7 +9,7 @@ libperf-y += env.o
libperf-y += event.o
libperf-y += evlist.o
libperf-y += evsel.o
-libperf-y += find_next_bit.o
+libperf-y += find_bit.o
libperf-y += kallsyms.o
libperf-y += levenshtein.o
libperf-y += llvm-utils.o
@@ -132,7 +132,7 @@ CFLAGS_pmu-bison.o += -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -w
$(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c
$(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
-CFLAGS_find_next_bit.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
+CFLAGS_find_bit.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
CFLAGS_rbtree.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
@@ -142,7 +142,7 @@ $(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
-$(OUTPUT)util/find_next_bit.o: ../lib/util/find_next_bit.c FORCE
+$(OUTPUT)util/find_bit.o: ../lib/find_bit.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
index 38a0b63ebe8b..f15d14fb35eb 100644
--- a/tools/perf/util/python-ext-sources
+++ b/tools/perf/util/python-ext-sources
@@ -11,7 +11,7 @@ util/evlist.c
util/evsel.c
util/cpumap.c
util/bitmap.c
-../lib/util/find_next_bit.c
+../lib/find_bit.c
../lib/hweight.c
util/thread_map.c
util/util.c