diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2012-10-10 16:16:59 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2012-10-10 16:16:59 -0500 |
| commit | 5b5cc3df8e5f83cac698a0961d09b2c02cedebcf (patch) | |
| tree | d0226df6c4daf654159cd6b0f5fdcb4c9d0909a0 /perf-build-fix.patch | |
| parent | 7594423fc02e17ea33274a13a77d550cf2520e5c (diff) | |
| download | kernel-5b5cc3df8e5f83cac698a0961d09b2c02cedebcf.tar.gz kernel-5b5cc3df8e5f83cac698a0961d09b2c02cedebcf.tar.xz kernel-5b5cc3df8e5f83cac698a0961d09b2c02cedebcf.zip | |
v3.6-9849-g2474542
Diffstat (limited to 'perf-build-fix.patch')
| -rw-r--r-- | perf-build-fix.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/perf-build-fix.patch b/perf-build-fix.patch new file mode 100644 index 000000000..341620c0d --- /dev/null +++ b/perf-build-fix.patch @@ -0,0 +1,68 @@ +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. +make[2]: *** [util/rbtree.o] Error 1 +make[1]: *** [perf_install] Error 2 +make: *** [tools/perf_install] Error 2 + +Fix by updating the Makefile and adding a btree_augmented.h wrapper. + +Reported-by: Borislav Petkov <borislav.petkov@amd.com> +Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> +--- + tools/perf/Makefile | 3 ++- + tools/perf/util/include/linux/rbtree.h | 1 - + tools/perf/util/include/linux/rbtree_augmented.h | 2 ++ + tools/perf/util/scripting-engines/trace-event-perl.c | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) + create mode 100644 tools/perf/util/include/linux/rbtree_augmented.h + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index 86258c2..9546ff5 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -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 $< +diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h +index 9bcdc84..2a030c5 100644 +--- a/tools/perf/util/include/linux/rbtree.h ++++ b/tools/perf/util/include/linux/rbtree.h +@@ -1,3 +1,2 @@ + #include <stdbool.h> +-#include <stdbool.h> + #include "../../../../include/linux/rbtree.h" +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 0000000..9d6fcdf +--- /dev/null ++++ b/tools/perf/util/include/linux/rbtree_augmented.h +@@ -0,0 +1,2 @@ ++#include <stdbool.h> ++#include "../../../../include/linux/rbtree_augmented.h" +diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c +index f80605e..f53889d 100644 +-- +Markus +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ |