From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 10 Mar 2022 12:14:13 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.9.306~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75ff8c6d74018011dc8a87f198d0176872fde330;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	arm-fix-build-warning-in-proc-v7-bugs.c.patch
---

diff --git a/queue-4.19/arm-fix-build-warning-in-proc-v7-bugs.c.patch b/queue-4.19/arm-fix-build-warning-in-proc-v7-bugs.c.patch
new file mode 100644
index 00000000000..61bb4f7be88
--- /dev/null
+++ b/queue-4.19/arm-fix-build-warning-in-proc-v7-bugs.c.patch
@@ -0,0 +1,36 @@
+From b1a384d2cbccb1eb3f84765020d25e2c1929706e Mon Sep 17 00:00:00 2001
+From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
+Date: Thu, 10 Mar 2022 10:22:14 +0000
+Subject: ARM: fix build warning in proc-v7-bugs.c
+
+From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+
+commit b1a384d2cbccb1eb3f84765020d25e2c1929706e upstream.
+
+The kernel test robot discovered that building without
+HARDEN_BRANCH_PREDICTOR issues a warning due to a missing
+argument to pr_info().
+
+Add the missing argument.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Fixes: 9dd78194a372 ("ARM: report Spectre v2 status through sysfs")
+Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/mm/proc-v7-bugs.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/mm/proc-v7-bugs.c
++++ b/arch/arm/mm/proc-v7-bugs.c
+@@ -110,7 +110,8 @@ static unsigned int spectre_v2_install_w
+ #else
+ static unsigned int spectre_v2_install_workaround(unsigned int method)
+ {
+-	pr_info("CPU%u: Spectre V2: workarounds disabled by configuration\n");
++	pr_info("CPU%u: Spectre V2: workarounds disabled by configuration\n",
++		smp_processor_id());
+ 
+ 	return SPECTRE_VULNERABLE;
+ }
diff --git a/queue-4.19/series b/queue-4.19/series
index faedf6fe431..088dce665ca 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -19,3 +19,4 @@ arm-fix-build-error-when-bpf_syscall-is-disabled.patch
 kbuild-add-config_ld_is_lld.patch
 arm-fix-co-processor-register-typo.patch
 arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch
+arm-fix-build-warning-in-proc-v7-bugs.c.patch