Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Markus Trippelsdorf and committed by
Linus Torvalds
871a0596 4e21fc13

+4 -1
+2 -1
tools/perf/Makefile
··· 268 268 LIB_H += util/include/linux/poison.h 269 269 LIB_H += util/include/linux/prefetch.h 270 270 LIB_H += util/include/linux/rbtree.h 271 + LIB_H += util/include/linux/rbtree_augmented.h 271 272 LIB_H += util/include/linux/string.h 272 273 LIB_H += util/include/linux/types.h 273 274 LIB_H += util/include/linux/linkage.h ··· 907 906 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< 908 907 909 908 $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS 910 - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< 909 + $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< 911 910 912 911 $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS 913 912 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $<
+2
tools/perf/util/include/linux/rbtree_augmented.h
··· 1 + #include <stdbool.h> 2 + #include "../../../../include/linux/rbtree_augmented.h"