diff options
-rw-r--r-- | tools/include/linux/compiler.h (renamed from tools/perf/util/include/linux/compiler.h) | 6 | ||||
-rw-r--r-- | tools/perf/Makefile.perf | 2 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/include/linux/compiler.h index b003ad7200b2..0135ccf2a00c 100644 --- a/tools/perf/util/include/linux/compiler.h +++ b/tools/include/linux/compiler.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _PERF_LINUX_COMPILER_H_ | 1 | #ifndef _TOOLS_LINUX_COMPILER_H_ |
2 | #define _PERF_LINUX_COMPILER_H_ | 2 | #define _TOOLS_LINUX_COMPILER_H_ |
3 | 3 | ||
4 | #ifndef __always_inline | 4 | #ifndef __always_inline |
5 | # define __always_inline inline __attribute__((always_inline)) | 5 | # define __always_inline inline __attribute__((always_inline)) |
@@ -27,4 +27,4 @@ | |||
27 | # define __weak __attribute__((weak)) | 27 | # define __weak __attribute__((weak)) |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #endif | 30 | #endif /* _TOOLS_LINUX_COMPILER_H */ |
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 |