From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 15 May 2019 05:50:12 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v3.18.140~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dc969730125db1adce66d7938b4d81ab0e488bb;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	powerpc-64s-include-cpu-header.patch
---

diff --git a/queue-4.9/powerpc-64s-include-cpu-header.patch b/queue-4.9/powerpc-64s-include-cpu-header.patch
new file mode 100644
index 00000000000..37b114101d6
--- /dev/null
+++ b/queue-4.9/powerpc-64s-include-cpu-header.patch
@@ -0,0 +1,47 @@
+From 42e2acde1237878462b028f5a27d9cc5bea7502c Mon Sep 17 00:00:00 2001
+From: Breno Leitao <leitao@debian.org>
+Date: Mon, 22 Oct 2018 11:54:12 -0300
+Subject: powerpc/64s: Include cpu header
+
+From: Breno Leitao <leitao@debian.org>
+
+commit 42e2acde1237878462b028f5a27d9cc5bea7502c upstream.
+
+Current powerpc security.c file is defining functions, as
+cpu_show_meltdown(), cpu_show_spectre_v{1,2} and others, that are being
+declared at linux/cpu.h header without including the header file that
+contains these declarations.
+
+This is being reported by sparse, which thinks that these functions are
+static, due to the lack of declaration:
+
+	arch/powerpc/kernel/security.c:105:9: warning: symbol 'cpu_show_meltdown' was not declared. Should it be static?
+	arch/powerpc/kernel/security.c:139:9: warning: symbol 'cpu_show_spectre_v1' was not declared. Should it be static?
+	arch/powerpc/kernel/security.c:161:9: warning: symbol 'cpu_show_spectre_v2' was not declared. Should it be static?
+	arch/powerpc/kernel/security.c:209:6: warning: symbol 'stf_barrier' was not declared. Should it be static?
+	arch/powerpc/kernel/security.c:289:9: warning: symbol 'cpu_show_spec_store_bypass' was not declared. Should it be static?
+
+This patch simply includes the proper header (linux/cpu.h) to match
+function definition and declaration.
+
+Signed-off-by: Breno Leitao <leitao@debian.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Cc: Joel Stanley <joel@jms.id.au>
+Cc: Nathan Chancellor <natechancellor@gmail.com>
+Cc: Major Hayden <major@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/kernel/security.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/kernel/security.c
++++ b/arch/powerpc/kernel/security.c
+@@ -4,6 +4,7 @@
+ //
+ // Copyright 2018, Michael Ellerman, IBM Corporation.
+ 
++#include <linux/cpu.h>
+ #include <linux/kernel.h>
+ #include <linux/debugfs.h>
+ #include <linux/device.h>
diff --git a/queue-4.9/series b/queue-4.9/series
index 18edea997b7..a81998bc140 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -36,3 +36,4 @@ revert-x86-vdso-use-ld-instead-of-cc-to-link.patch
 x86-vdso-use-ld-instead-of-cc-to-link.patch-23362
 x86-vdso-drop-implicit-common-page-size-linker-flag.patch
 x86-vdso-pass-eh-frame-hdr-to-the-linker.patch
+powerpc-64s-include-cpu-header.patch