5.4-stable patches

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

diff --git a/queue-5.4/arm-fix-build-warning-in-proc-v7-bugs.c.patch b/queue-5.4/arm-fix-build-warning-in-proc-v7-bugs.c.patch
new file mode 100644 (file)
index 0000000..340e709
--- /dev/null
+++ b/queue-5.4/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
+@@ -109,7 +109,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-5.4/series b/queue-5.4/series
index e415e7d5f40e20a69421b1e4085d6389b3f1cf3d..0d55391d4eaed1c73887dc6a9207e533491c1803 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -18,3 +18,4 @@ arm-include-unprivileged-bpf-status-in-spectre-v2-reporting.patch
 arm-fix-build-error-when-bpf_syscall-is-disabled.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