diff options
author | Namhyung Kim <namhyung@kernel.org> | 2014-01-09 09:00:52 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-13 08:06:25 -0500 |
commit | 8a625c1f61f3dd5e4ea4b5b642650416aa101ce5 (patch) | |
tree | d62c6214b12b6a103bd3b3c34af33475d58db547 /tools/perf | |
parent | 0050f7aa182e3e8ed34dd6cc4318e52b3df6347a (diff) |
tools include: Move perf's linux/compiler.h to a generic place
So that it can be shared with others like libtraceevent.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Borislav Petkov <bp@suse.de>
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-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/Makefile.perf | 2 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 1 | ||||
-rw-r--r-- | tools/perf/util/include/linux/compiler.h | 30 |
3 files changed, 2 insertions, 31 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 3638b0bd20dc..6be06767da7b 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -211,7 +211,7 @@ LIB_H += ../../include/linux/hash.h | |||
211 | LIB_H += ../../include/linux/stringify.h | 211 | LIB_H += ../../include/linux/stringify.h |
212 | LIB_H += util/include/linux/bitmap.h | 212 | LIB_H += util/include/linux/bitmap.h |
213 | LIB_H += util/include/linux/bitops.h | 213 | LIB_H += util/include/linux/bitops.h |
214 | LIB_H += util/include/linux/compiler.h | 214 | LIB_H += ../include/linux/compiler.h |
215 | LIB_H += util/include/linux/const.h | 215 | LIB_H += util/include/linux/const.h |
216 | LIB_H += util/include/linux/ctype.h | 216 | LIB_H += util/include/linux/ctype.h |
217 | LIB_H += util/include/linux/kernel.h | 217 | LIB_H += util/include/linux/kernel.h |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 5d15b43b03c6..01dd43df0d04 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -232,6 +232,7 @@ endif | |||
232 | 232 | ||
233 | CFLAGS += -I$(src-perf)/util/include | 233 | CFLAGS += -I$(src-perf)/util/include |
234 | CFLAGS += -I$(src-perf)/arch/$(ARCH)/include | 234 | CFLAGS += -I$(src-perf)/arch/$(ARCH)/include |
235 | CFLAGS += -I$(srctree)/tools/include/ | ||
235 | CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi | 236 | CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi |
236 | CFLAGS += -I$(srctree)/arch/$(ARCH)/include | 237 | CFLAGS += -I$(srctree)/arch/$(ARCH)/include |
237 | CFLAGS += -I$(srctree)/include/uapi | 238 | CFLAGS += -I$(srctree)/include/uapi |
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h deleted file mode 100644 index b003ad7200b2..000000000000 --- a/tools/perf/util/include/linux/compiler.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | #ifndef _PERF_LINUX_COMPILER_H_ | ||
2 | #define _PERF_LINUX_COMPILER_H_ | ||
3 | |||
4 | #ifndef __always_inline | ||
5 | # define __always_inline inline __attribute__((always_inline)) | ||
6 | #endif | ||
7 | |||
8 | #define __user | ||
9 | |||
10 | #ifndef __attribute_const__ | ||
11 | # define __attribute_const__ | ||
12 | #endif | ||
13 | |||
14 | #ifndef __maybe_unused | ||
15 | # define __maybe_unused __attribute__((unused)) | ||
16 | #endif | ||
17 | |||
18 | #ifndef __packed | ||
19 | # define __packed __attribute__((__packed__)) | ||
20 | #endif | ||
21 | |||
22 | #ifndef __force | ||
23 | # define __force | ||
24 | #endif | ||
25 | |||
26 | #ifndef __weak | ||
27 | # define __weak __attribute__((weak)) | ||
28 | #endif | ||
29 | |||
30 | #endif | ||