aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2014-01-09 09:00:54 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-01-13 08:06:26 -0500
commit02dfc8d775f0709ab494d4b2cce12c8429ff7530 (patch)
tree51de67a47ce9fc12b98eb06b956f36a28df757a1 /tools/perf
parent835d44b9041e578e3e553a57dfffc7003605c93b (diff)
tools include: Move perf's bug.h to a generic place
So that it can be shared with others like libtraceevent. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung.kim@lge.com> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1389276059-8829-4-git-send-email-namhyung@kernel.org [ Added the new header to tools/perf/MANIFEST ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/MANIFEST1
-rw-r--r--tools/perf/Makefile.perf2
-rw-r--r--tools/perf/util/include/asm/bug.h22
3 files changed, 2 insertions, 23 deletions
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 285f28f7f821..4e535354f162 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -4,6 +4,7 @@ tools/lib/traceevent
4tools/lib/lk 4tools/lib/lk
5tools/lib/symbol/kallsyms.c 5tools/lib/symbol/kallsyms.c
6tools/lib/symbol/kallsyms.h 6tools/lib/symbol/kallsyms.h
7tools/include/asm/bug.h
7tools/include/linux/compiler.h 8tools/include/linux/compiler.h
8include/linux/const.h 9include/linux/const.h
9include/linux/perf_event.h 10include/linux/perf_event.h
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 6be06767da7b..87d7726cee2d 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -226,7 +226,7 @@ LIB_H += util/include/linux/string.h
226LIB_H += util/include/linux/types.h 226LIB_H += util/include/linux/types.h
227LIB_H += util/include/linux/linkage.h 227LIB_H += util/include/linux/linkage.h
228LIB_H += util/include/asm/asm-offsets.h 228LIB_H += util/include/asm/asm-offsets.h
229LIB_H += util/include/asm/bug.h 229LIB_H += ../include/asm/bug.h
230LIB_H += util/include/asm/byteorder.h 230LIB_H += util/include/asm/byteorder.h
231LIB_H += util/include/asm/hweight.h 231LIB_H += util/include/asm/hweight.h
232LIB_H += util/include/asm/swab.h 232LIB_H += util/include/asm/swab.h
diff --git a/tools/perf/util/include/asm/bug.h b/tools/perf/util/include/asm/bug.h
deleted file mode 100644
index 7fcc6810adc2..000000000000
--- a/tools/perf/util/include/asm/bug.h
+++ /dev/null
@@ -1,22 +0,0 @@
1#ifndef _PERF_ASM_GENERIC_BUG_H
2#define _PERF_ASM_GENERIC_BUG_H
3
4#define __WARN_printf(arg...) do { fprintf(stderr, arg); } while (0)
5
6#define WARN(condition, format...) ({ \
7 int __ret_warn_on = !!(condition); \
8 if (unlikely(__ret_warn_on)) \
9 __WARN_printf(format); \
10 unlikely(__ret_warn_on); \
11})
12
13#define WARN_ONCE(condition, format...) ({ \
14 static int __warned; \
15 int __ret_warn_once = !!(condition); \
16 \
17 if (unlikely(__ret_warn_once)) \
18 if (WARN(!__warned, format)) \
19 __warned = 1; \
20 unlikely(__ret_warn_once); \
21})
22#endif