From: Greg Kroah-Hartman Date: Thu, 10 Mar 2022 12:14:05 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.9.306~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a5bfc93577a94bab5d36d427f2f7a333d7d4334;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: arm-fix-build-warning-in-proc-v7-bugs.c.patch --- diff --git a/queue-4.14/arm-fix-build-warning-in-proc-v7-bugs.c.patch b/queue-4.14/arm-fix-build-warning-in-proc-v7-bugs.c.patch new file mode 100644 index 00000000000..61bb4f7be88 --- /dev/null +++ b/queue-4.14/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)" +Date: Thu, 10 Mar 2022 10:22:14 +0000 +Subject: ARM: fix build warning in proc-v7-bugs.c + +From: Russell King (Oracle) + +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 +Fixes: 9dd78194a372 ("ARM: report Spectre v2 status through sysfs") +Signed-off-by: Russell King (Oracle) +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + 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.14/series b/queue-4.14/series index e415e7d5f40..0d55391d4ea 100644 --- a/queue-4.14/series +++ b/queue-4.14/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