From 02dfc8d775f0709ab494d4b2cce12c8429ff7530 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Thu, 9 Jan 2014 23:00:54 +0900 Subject: [PATCH] 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 Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jiri Olsa Cc: Namhyung Kim Cc: Steven Rostedt 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 --- tools/{perf/util => }/include/asm/bug.h | 7 ++++--- tools/perf/MANIFEST | 1 + tools/perf/Makefile.perf | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename tools/{perf/util => }/include/asm/bug.h (85%) diff --git a/tools/perf/util/include/asm/bug.h b/tools/include/asm/bug.h similarity index 85% rename from tools/perf/util/include/asm/bug.h rename to tools/include/asm/bug.h index 7fcc681..eca78df 100644 --- a/tools/perf/util/include/asm/bug.h +++ b/tools/include/asm/bug.h @@ -1,5 +1,5 @@ -#ifndef _PERF_ASM_GENERIC_BUG_H -#define _PERF_ASM_GENERIC_BUG_H +#ifndef _TOOLS_ASM_BUG_H +#define _TOOLS_ASM_BUG_H #define __WARN_printf(arg...) do { fprintf(stderr, arg); } while (0) @@ -19,4 +19,5 @@ __warned = 1; \ unlikely(__ret_warn_once); \ }) -#endif + +#endif /* _TOOLS_ASM_BUG_H */ diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 285f28f..4e53535 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -4,6 +4,7 @@ tools/lib/traceevent tools/lib/lk tools/lib/symbol/kallsyms.c tools/lib/symbol/kallsyms.h +tools/include/asm/bug.h tools/include/linux/compiler.h include/linux/const.h include/linux/perf_event.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 6be0676..87d7726 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -226,7 +226,7 @@ LIB_H += util/include/linux/string.h LIB_H += util/include/linux/types.h LIB_H += util/include/linux/linkage.h LIB_H += util/include/asm/asm-offsets.h -LIB_H += util/include/asm/bug.h +LIB_H += ../include/asm/bug.h LIB_H += util/include/asm/byteorder.h LIB_H += util/include/asm/hweight.h LIB_H += util/include/asm/swab.h -- 2.7.4