Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-10-02 21:26:28 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-10-02 21:26:28 +0200
commit9467589effc980f570d10313e1e899bc348d18e1 (patch)
tree8eec52e1dd6a56384ffb108d76a2e77c464d646a
parent8fcebeb7f4c0761e21744fb357110aa03320e28c (diff)
powerpc/powernv: Fix compile without CONFIG_TRACEPOINTS
(bsc#1065729).
-rw-r--r--patches.suse/powerpc-powernv-Fix-compile-without-CONFIG_TRACEPOIN.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.suse/powerpc-powernv-Fix-compile-without-CONFIG_TRACEPOIN.patch b/patches.suse/powerpc-powernv-Fix-compile-without-CONFIG_TRACEPOIN.patch
new file mode 100644
index 0000000000..2102496cb4
--- /dev/null
+++ b/patches.suse/powerpc-powernv-Fix-compile-without-CONFIG_TRACEPOIN.patch
@@ -0,0 +1,35 @@
+From 1702877621ff1c8a737857b71d379510267a17db Mon Sep 17 00:00:00 2001
+From: Alexey Kardashevskiy <aik@ozlabs.ru>
+Date: Tue, 12 Mar 2019 16:07:12 +1100
+Subject: [PATCH] powerpc/powernv: Fix compile without CONFIG_TRACEPOINTS
+
+References: bsc#1065729
+Patch-mainline: v5.1-rc1
+Git-commit: 1702877621ff1c8a737857b71d379510267a17db
+
+The functions returns s64 but the return statement is missing.
+This adds the missing return statement.
+
+Fixes: 75d9fc7fd94e ("powerpc/powernv: move OPAL call wrapper tracing and interrupt handling to C")
+Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/platforms/powernv/opal-call.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/powerpc/platforms/powernv/opal-call.c b/arch/powerpc/platforms/powernv/opal-call.c
+index 578757d403ab..daad8c45c8e7 100644
+--- a/arch/powerpc/platforms/powernv/opal-call.c
++++ b/arch/powerpc/platforms/powernv/opal-call.c
+@@ -86,6 +86,7 @@ static s64 __opal_call_trace(s64 a0, s64 a1, s64 a2, s64 a3,
+ s64 a4, s64 a5, s64 a6, s64 a7,
+ unsigned long opcode, unsigned long msr)
+ {
++ return 0;
+ }
+
+ #define DO_TRACE false
+--
+2.23.0
+
diff --git a/series.conf b/series.conf
index c1d7eb1bb9..310e80c18c 100644
--- a/series.conf
+++ b/series.conf
@@ -22571,6 +22571,7 @@
patches.suse/cifs-fix-incorrect-handling-of-smb2_set_sparse-return-in-smb3_sim.patch
patches.suse/SMB3-Allow-SMB3-FSCTL-queries-to-be-sent-to-server-from-tools.patch
patches.suse/CIFS-fix-POSIX-lock-leak-and-invalid-ptr-deref.patch
+ patches.suse/powerpc-powernv-Fix-compile-without-CONFIG_TRACEPOIN.patch
patches.suse/It-s-wrong-to-add-len-to-sector_nr-in-raid10-reshape.patch
patches.suse/md-Fix-failed-allocation-of-md_register_thread.patch
patches.suse/nvme-fc-reject-reconnect-if-io-queue-count-is-reduce.patch