From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 14 Mar 2019 17:37:42 +0000 (-0700)
Subject: 4.14-stable patches
X-Git-Tag: v5.0.3~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b28b8cc33d9f5473430009af8ebce36d86a7c2a;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	perf-tools-fix-compile-error-with-libunwind-x86.patch
---

diff --git a/queue-4.14/perf-tools-fix-compile-error-with-libunwind-x86.patch b/queue-4.14/perf-tools-fix-compile-error-with-libunwind-x86.patch
new file mode 100644
index 00000000000..8b3fcf532fe
--- /dev/null
+++ b/queue-4.14/perf-tools-fix-compile-error-with-libunwind-x86.patch
@@ -0,0 +1,49 @@
+From 44df1afdb174fd6038e419f80efd914c0b5f2f85 Mon Sep 17 00:00:00 2001
+From: Wang Nan <wangnan0@huawei.com>
+Date: Wed, 6 Dec 2017 01:50:40 +0000
+Subject: perf tools: Fix compile error with libunwind x86
+
+From: Wang Nan <wangnan0@huawei.com>
+
+commit 44df1afdb174fd6038e419f80efd914c0b5f2f85 upstream.
+
+Fix a compile error:
+
+ ...
+   CC       util/libunwind/x86_32.o
+ In file included from util/libunwind/x86_32.c:33:0:
+ util/libunwind/../../arch/x86/util/unwind-libunwind.c: In function 'libunwind__x86_reg_id':
+ util/libunwind/../../arch/x86/util/unwind-libunwind.c:110:11: error: 'EINVAL' undeclared (first use in this function)
+    return -EINVAL;
+            ^
+ util/libunwind/../../arch/x86/util/unwind-libunwind.c:110:11: note: each undeclared identifier is reported only once for each function it appears in
+ mv: cannot stat 'util/libunwind/.x86_32.o.tmp': No such file or directory
+ make[4]: *** [util/libunwind/x86_32.o] Error 1
+ make[3]: *** [util] Error 2
+ make[2]: *** [libperf-in.o] Error 2
+ make[1]: *** [sub-make] Error 2
+ make: *** [all] Error 2
+
+It happens when libunwind-x86 feature is detected.
+
+Signed-off-by: Wang Nan <wangnan0@huawei.com>
+Link: http://lkml.kernel.org/r/20171206015040.114574-1-wangnan0@huawei.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Daniel Díaz <daniel.diaz@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/perf/arch/x86/util/unwind-libunwind.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/perf/arch/x86/util/unwind-libunwind.c
++++ b/tools/perf/arch/x86/util/unwind-libunwind.c
+@@ -1,7 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
+ 
+-#ifndef REMOTE_UNWIND_LIBUNWIND
+ #include <errno.h>
++#ifndef REMOTE_UNWIND_LIBUNWIND
+ #include <libunwind.h>
+ #include "perf_regs.h"
+ #include "../../util/unwind.h"
diff --git a/queue-4.14/series b/queue-4.14/series
index 335d60b2264..493aaf71355 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1 +1,2 @@
 acpica-reference-counts-increase-max-to-0x4000-for-large-servers.patch
+perf-tools-fix-compile-error-with-libunwind-x86.patch