perf: Handle new rbtree implementation (871a0596) · Commits · 戴 / test

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>

tools/perf/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -268,6 +268,7 @@ LIB_H += util/include/linux/magic.h
		LIB_H += util/include/linux/poison.h
		LIB_H += util/include/linux/prefetch.h
		LIB_H += util/include/linux/rbtree.h
		LIB_H += util/include/linux/rbtree_augmented.h
		LIB_H += util/include/linux/string.h
		LIB_H += util/include/linux/types.h
		LIB_H += util/include/linux/linkage.h
		@@ -906,7 +907,7 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<

		$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<

		$(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $<

tools/perf/util/include/linux/rbtree_augmented.h

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		#include <stdbool.h>
		#include "../../../../include/linux/rbtree_augmented.h"

Admin message