From 2b5f419b8526d1d1705cb51167d4994e313839a7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 13 Oct 2015 22:02:43 +0100 Subject: [PATCH] Update to 4.3-rc5 --- debian/changelog | 5 +- ...uild-break-on-powerpc-due-to-sample_.patch | 75 ------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 debian/patches/perf-tools-fix-build-break-on-powerpc-due-to-sample_.patch diff --git a/debian/changelog b/debian/changelog index fdf6c6cc7..aaee693c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -linux-tools (4.3~rc4-1~exp2) UNRELEASED; urgency=medium +linux-tools (4.3~rc5-1~exp1) UNRELEASED; urgency=medium - * perf: Fix build on architectures without CONFIG_PERF_REGS + * New upstream release candidate + - perf: Fix build on architectures without CONFIG_PERF_REGS -- Ben Hutchings Thu, 08 Oct 2015 17:54:09 +0100 diff --git a/debian/patches/perf-tools-fix-build-break-on-powerpc-due-to-sample_.patch b/debian/patches/perf-tools-fix-build-break-on-powerpc-due-to-sample_.patch deleted file mode 100644 index f660de82b..000000000 --- a/debian/patches/perf-tools-fix-build-break-on-powerpc-due-to-sample_.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Sukadev Bhattiprolu -Date: Thu, 24 Sep 2015 17:53:49 -0400 -Subject: perf tools: Fix build break on powerpc due to sample_reg_masks -Origin: https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit?id=9fb4765451f22c5e782c1590747717550bff34b2 - -perf_regs.c does not get built on Powerpc as CONFIG_PERF_REGS is false. -So the weak definition for 'sample_regs_masks' doesn't get picked up. - -Adding perf_regs.o to util/Build unconditionally, exposes a redefinition -error for 'perf_reg_value()' function (due to the static inline version -in util/perf_regs.h). So use #ifdef HAVE_PERF_REGS_SUPPORT' around that -function. - -Signed-off-by: Sukadev Bhattiprolu -Acked-by: Jiri Olsa -Cc: Naveen N. Rao -Cc: Stephane Eranian -Cc: linuxppc-dev@ozlabs.org -Link: http://lkml.kernel.org/r/20150930182836.GA27858@us.ibm.com -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/util/Build | 2 +- - tools/perf/util/perf_regs.c | 2 ++ - tools/perf/util/perf_regs.h | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/Build b/tools/perf/util/Build -index 349bc96..e5f18a2 100644 ---- a/tools/perf/util/Build -+++ b/tools/perf/util/Build -@@ -17,6 +17,7 @@ libperf-y += levenshtein.o - libperf-y += llvm-utils.o - libperf-y += parse-options.o - libperf-y += parse-events.o -+libperf-y += perf_regs.o - libperf-y += path.o - libperf-y += rbtree.o - libperf-y += bitmap.o -@@ -103,7 +104,6 @@ libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o - - libperf-y += scripting-engines/ - --libperf-$(CONFIG_PERF_REGS) += perf_regs.o - libperf-$(CONFIG_ZLIB) += zlib.o - libperf-$(CONFIG_LZMA) += lzma.o - -diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c -index 885e8ac..6b8eb13 100644 ---- a/tools/perf/util/perf_regs.c -+++ b/tools/perf/util/perf_regs.c -@@ -6,6 +6,7 @@ const struct sample_reg __weak sample_reg_masks[] = { - SMPL_REG_END - }; - -+#ifdef HAVE_PERF_REGS_SUPPORT - int perf_reg_value(u64 *valp, struct regs_dump *regs, int id) - { - int i, idx = 0; -@@ -29,3 +30,4 @@ out: - *valp = regs->cache_regs[id]; - return 0; - } -+#endif -diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h -index 2984dcc..679d6e4 100644 ---- a/tools/perf/util/perf_regs.h -+++ b/tools/perf/util/perf_regs.h -@@ -2,6 +2,7 @@ - #define __PERF_REGS_H - - #include -+#include - - struct regs_dump; - diff --git a/debian/patches/series b/debian/patches/series index 0ef4a447a..d5becb893 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,4 +15,3 @@ tools-lib-lockdep-use-ldflags.patch tools-hv-fix-fortify-format-warning.patch revert-perf-build-fix-libunwind-feature-detection-on.patch alpha-uapi-add-support-for-__sane_userspace_types__.patch -perf-tools-fix-build-break-on-powerpc-due-to-sample_.patch