diff options
Diffstat (limited to 'perf-build-fix.patch')
| -rw-r--r-- | perf-build-fix.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/perf-build-fix.patch b/perf-build-fix.patch deleted file mode 100644 index e81b1e031..000000000 --- a/perf-build-fix.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 -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/ |