diff mbox series

[5.10,46/58] ARM: fix build warning in proc-v7-bugs.c

Message ID	20220310140814.181013692@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, kernel test robot <lkp@intel.com>, "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>, Linus Torvalds <torvalds@linux-foundation.org> Subject: [PATCH 5.10 46/58] ARM: fix build warning in proc-v7-bugs.c Date: Thu, 10 Mar 2022 15:19:06 +0100 Message-Id: <20220310140814.181013692@linuxfoundation.org> In-Reply-To: <20220310140812.869208747@linuxfoundation.org> References: <20220310140812.869208747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,02/58] x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE [5.10,05/58] x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting [5.10,06/58] x86/speculation: Use generic retpoline by default on AMD [5.10,11/58] ARM: early traps initialisation [5.10,12/58] ARM: use LOADADDR() to get load address of sections [5.10,13/58] ARM: Spectre-BHB workaround [5.10,18/58] arm64: Add Cortex-A510 CPU part definition [5.10,19/58] arm64: Add HWCAP for self-synchronising virtual counter [5.10,20/58] arm64: add ID_AA64ISAR2_EL1 sys register [5.10,24/58] arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit [5.10,27/58] arm64: entry: Move the trampoline data page before the text page [5.10,29/58] arm64: entry: Dont assume tramp_vectors is the start of the vectors [5.10,31/58] arm64: entry: Make the kpti trampolines kpti sequence optional [5.10,34/58] arm64: entry: Add vectors that have the bhb mitigation sequences [5.10,35/58] arm64: entry: Add macro for reading symbol addresses from the trampoline [5.10,37/58] arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 [5.10,38/58] KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A [5.10,43/58] ARM: fix build error when BPF_SYSCALL is disabled [5.10,46/58] ARM: fix build warning in proc-v7-bugs.c [5.10,47/58] xen/xenbus: dont let xenbus_grant_ring() remove grants in error case [5.10,48/58] xen/grant-table: add gnttab_try_end_foreign_access() [5.10,51/58] xen/scsifront: dont use gnttab_query_foreign_access() for mapped status [5.10,52/58] xen/gntalloc: dont use gnttab_query_foreign_access() [5.10,53/58] xen: remove gnttab_query_foreign_access() [5.10,54/58] xen/9p: use alloc/free_pages_exact() [5.10,58/58] Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE"

Commit Message

Greg Kroah-Hartman March 10, 2022, 2:19 p.m. UTC

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(-)

diff mbox series

Patch

--- a/arch/arm/mm/proc-v7-bugs.c
+++ b/arch/arm/mm/proc-v7-bugs.c
@@ -108,7 +108,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;
 }