From: Sasha Levin <sashal@kernel.org>
Date: Mon, 3 Feb 2020 22:42:39 +0000 (-0500)
Subject: fixes for 4.14
X-Git-Tag: v5.5.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2193069cc1e08432c9b8a21b4443e68ca6bb89e2;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/perf-report-fix-no-libunwind-compiled-warning-break-.patch b/queue-4.14/perf-report-fix-no-libunwind-compiled-warning-break-.patch
new file mode 100644
index 00000000000..fa2f83a09be
--- /dev/null
+++ b/queue-4.14/perf-report-fix-no-libunwind-compiled-warning-break-.patch
@@ -0,0 +1,58 @@
+From 1359f4ea63bcd3883c21b636d89ce95dec6e672e Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 8 Jan 2020 03:17:45 +0800
+Subject: perf report: Fix no libunwind compiled warning break s390 issue
+
+From: Jin Yao <yao.jin@linux.intel.com>
+
+[ Upstream commit c3314a74f86dc00827e0945c8e5039fc3aebaa3c ]
+
+Commit 800d3f561659 ("perf report: Add warning when libunwind not
+compiled in") breaks the s390 platform. S390 uses libdw-dwarf-unwind for
+call chain unwinding and had no support for libunwind.
+
+So the warning "Please install libunwind development packages during the
+perf build." caused the confusion even if the call-graph is displayed
+correctly.
+
+This patch adds checking for HAVE_DWARF_SUPPORT, which is set when
+libdw-dwarf-unwind is compiled in.
+
+Fixes: 800d3f561659 ("perf report: Add warning when libunwind not compiled in")
+Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
+Reviewed-by: Thomas Richter <tmricht@linux.ibm.com>
+Tested-by: Thomas Richter <tmricht@linux.ibm.com>
+Acked-by: Jiri Olsa <jolsa@redhat.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Andi Kleen <ak@linux.intel.com>
+Cc: Jin Yao <yao.jin@intel.com>
+Cc: Kan Liang <kan.liang@linux.intel.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lore.kernel.org/lkml/20200107191745.18415-1-yao.jin@linux.intel.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ tools/perf/builtin-report.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
+index 17b26661b2f6b..429c3e140dc32 100644
+--- a/tools/perf/builtin-report.c
++++ b/tools/perf/builtin-report.c
+@@ -342,10 +342,10 @@ static int report__setup_sample_type(struct report *rep)
+ 				PERF_SAMPLE_BRANCH_ANY))
+ 		rep->nonany_branch_mode = true;
+ 
+-#ifndef HAVE_LIBUNWIND_SUPPORT
++#if !defined(HAVE_LIBUNWIND_SUPPORT) && !defined(HAVE_DWARF_SUPPORT)
+ 	if (dwarf_callchain_users) {
+-		ui__warning("Please install libunwind development packages "
+-			    "during the perf build.\n");
++		ui__warning("Please install libunwind or libdw "
++			    "development packages during the perf build.\n");
+ 	}
+ #endif
+ 
+-- 
+2.20.1
+
diff --git a/queue-4.14/series b/queue-4.14/series
index 4f3564850bb..4c63a3a5c65 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -88,3 +88,4 @@ seq_tab_next-should-increase-position-index.patch
 l2t_seq_next-should-increase-position-index.patch
 net-fix-skb-csum-update-in-inet_proto_csum_replace16.patch
 btrfs-do-not-zero-f_bavail-if-we-have-available-space.patch
+perf-report-fix-no-libunwind-compiled-warning-break-.patch