aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Trippelsdorf2012-10-09 13:01:56 -0500
committerLinus Torvalds2012-10-12 20:12:09 -0500
commit871a0596cb2f51b57dc583d1a7c4be0186582fe7 (patch)
tree1c67d9df2262f6239a4b54953c2297acdedd7fdf /tools/perf/Makefile
parent4e21fc138bfd7fe625ff5dc81541399aaf9d429b (diff)
downloadkernel-omap-871a0596cb2f51b57dc583d1a7c4be0186582fe7.tar.gz
kernel-omap-871a0596cb2f51b57dc583d1a7c4be0186582fe7.tar.xz
kernel-omap-871a0596cb2f51b57dc583d1a7c4be0186582fe7.zip
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>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r--tools/perf/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 86258c2a2c23..9546ff58f024 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -268,6 +268,7 @@ LIB_H += util/include/linux/magic.h
268LIB_H += util/include/linux/poison.h 268LIB_H += util/include/linux/poison.h
269LIB_H += util/include/linux/prefetch.h 269LIB_H += util/include/linux/prefetch.h
270LIB_H += util/include/linux/rbtree.h 270LIB_H += util/include/linux/rbtree.h
271LIB_H += util/include/linux/rbtree_augmented.h
271LIB_H += util/include/linux/string.h 272LIB_H += util/include/linux/string.h
272LIB_H += util/include/linux/types.h 273LIB_H += util/include/linux/types.h
273LIB_H += util/include/linux/linkage.h 274LIB_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 $<