diff options
| author | Markus Trippelsdorf <markus@trippelsdorf.de> | 2012-10-09 14:01:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:12:09 -0400 |
| commit | 871a0596cb2f51b57dc583d1a7c4be0186582fe7 (patch) | |
| tree | 1c67d9df2262f6239a4b54953c2297acdedd7fdf | |
| parent | 4e21fc138bfd7fe625ff5dc81541399aaf9d429b (diff) | |
perf: Handle new rbtree implementation
Perf build fails with the new rbtree implementation:
../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or directory compilation terminated.
Fix by updating the Makefile and adding a btree_augmented.h
wrapper.
Reported-and-tested-by: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Borislav Petkov <bp@amd64.org>
Link: http://lkml.kernel.org/r/20121009180156.GA245@x4
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | tools/perf/Makefile | 3 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/rbtree_augmented.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 86258c2a2c2..9546ff58f02 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -268,6 +268,7 @@ LIB_H += util/include/linux/magic.h | |||
| 268 | LIB_H += util/include/linux/poison.h | 268 | LIB_H += util/include/linux/poison.h |
| 269 | LIB_H += util/include/linux/prefetch.h | 269 | LIB_H += util/include/linux/prefetch.h |
| 270 | LIB_H += util/include/linux/rbtree.h | 270 | LIB_H += util/include/linux/rbtree.h |
| 271 | LIB_H += util/include/linux/rbtree_augmented.h | ||
| 271 | LIB_H += util/include/linux/string.h | 272 | LIB_H += util/include/linux/string.h |
| 272 | LIB_H += util/include/linux/types.h | 273 | LIB_H += util/include/linux/types.h |
| 273 | LIB_H += util/include/linux/linkage.h | 274 | LIB_H += util/include/linux/linkage.h |
| @@ -906,7 +907,7 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS | |||
| 906 | $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< | 907 | $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< |
| 907 | 908 | ||
| 908 | $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS | 909 | $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS |
| 909 | $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< | 910 | $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< |
| 910 | 911 | ||
| 911 | $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS | 912 | $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS |
| 912 | $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $< | 913 | $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $< |
diff --git a/tools/perf/util/include/linux/rbtree_augmented.h b/tools/perf/util/include/linux/rbtree_augmented.h new file mode 100644 index 00000000000..9d6fcdf1788 --- /dev/null +++ b/tools/perf/util/include/linux/rbtree_augmented.h | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | #include <stdbool.h> | ||
| 2 | #include "../../../../include/linux/rbtree_augmented.h" | ||