aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/include/asm/bug.h (renamed from tools/perf/util/include/asm/bug.h)7
-rw-r--r--tools/perf/MANIFEST1
-rw-r--r--tools/perf/Makefile.perf2
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/perf/util/include/asm/bug.h b/tools/include/asm/bug.h
index 7fcc6810adc2..eca78df7b8f2 100644
--- a/tools/perf/util/include/asm/bug.h
+++ b/tools/include/asm/bug.h
@@ -1,5 +1,5 @@
1#ifndef _PERF_ASM_GENERIC_BUG_H 1#ifndef _TOOLS_ASM_BUG_H
2#define _PERF_ASM_GENERIC_BUG_H 2#define _TOOLS_ASM_BUG_H
3 3
4#define __WARN_printf(arg...) do { fprintf(stderr, arg); } while (0) 4#define __WARN_printf(arg...) do { fprintf(stderr, arg); } while (0)
5 5
@@ -19,4 +19,5 @@
19 __warned = 1; \ 19 __warned = 1; \
20 unlikely(__ret_warn_once); \ 20 unlikely(__ret_warn_once); \
21}) 21})
22#endif 22
23#endif /* _TOOLS_ASM_BUG_H */
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