Browse Source

perf tools: Do not include stringify.h from the kernel sources

Use instead the copy just made to tools/include/linux/.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-q736w12nwy98x5ox2hamp5ow@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Arnaldo Carvalho de Melo 9 years ago
parent
commit
531d241063

+ 1 - 3
tools/perf/arch/powerpc/util/header.c

@@ -3,9 +3,7 @@
 #include <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
-
-#include "../../util/header.h"
-#include "../../util/util.h"
+#include <linux/stringify.h>
 
 
 #define mfspr(rn)       ({unsigned long rval; \
 #define mfspr(rn)       ({unsigned long rval; \
 			 asm volatile("mfspr %0," __stringify(rn) \
 			 asm volatile("mfspr %0," __stringify(rn) \

+ 1 - 0
tools/perf/builtin-report.c

@@ -41,6 +41,7 @@
 
 
 #include <dlfcn.h>
 #include <dlfcn.h>
 #include <linux/bitmap.h>
 #include <linux/bitmap.h>
+#include <linux/stringify.h>
 
 
 struct report {
 struct report {
 	struct perf_tool	tool;
 	struct perf_tool	tool;

+ 1 - 0
tools/perf/builtin-top.c

@@ -67,6 +67,7 @@
 #include <sys/utsname.h>
 #include <sys/utsname.h>
 #include <sys/mman.h>
 #include <sys/mman.h>
 
 
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/types.h>
 
 
 static volatile int done;
 static volatile int done;

+ 0 - 2
tools/perf/util/util.h

@@ -138,8 +138,6 @@ void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
 int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
 int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
 void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
 void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
 
 
-#include "../../../include/linux/stringify.h"
-
 void set_warning_routine(void (*routine)(const char *err, va_list params));
 void set_warning_routine(void (*routine)(const char *err, va_list params));
 
 
 int prefixcmp(const char *str, const char *prefix);
 int prefixcmp(const char *str, const char *prefix);