From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0BB7AC433F5 for ; Sat, 12 Mar 2022 10:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:From:Cc:To :Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=swVCN62eIyi2VzkawwS9lT+fdnN7jTnS5tIbjrpOZ6k=; b=AeocuGaShTPZg3 e5VWuajhjwBsB8/obzQp1z+TryARBpo1t3ry0sz8jChjxYaAe7kYDMjxt+sTR51NhgCqJQB5+5BUj jISQzgj1EwmnL71UhexApBsgxGAYTO+6rzdzu/F426dSmOVxrLa9A1lr5Mk8hmKMEyp2ACCPZL+Hq ovodhmdYWFS0NuZ7ZEIX4skujsCXW79CZo91TshCi2iW7mdkPMWxcjfR8Ou3d2EZXRogqwCJIUyfd gS/MZH8z0FLmAKFK7TjmE/zAcO87UqDooJ5pqE38ezhJvxcjhCwo6lGwRt6K30vZKKc76idV8vJ1u TRR4SsMlcK9nfdYe8fIw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSzAL-0015Vz-H6; Sat, 12 Mar 2022 10:40:05 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSzAG-0015UV-Vd for linux-arm-kernel@lists.infradead.org; Sat, 12 Mar 2022 10:40:02 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8DC0C60AFD; Sat, 12 Mar 2022 10:40:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59843C340EB; Sat, 12 Mar 2022 10:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647081600; bh=zH7mZYOblD4r5MhYfwBalQ4YdYe7IO8Ko6BdvZu3MYQ=; h=Subject:To:Cc:From:Date:From; b=b4gETavT+84sax80BAfyX3Yk3Aj4jBX9k42o4zJH7uwbNe2L/r5s4UWH90pl7RpAi LFj1xnkmbrWrmN5vNZgoRTfFlU6eiRgByd0jPjC7UjUPo39SThUaa4+PTaBlSljz3x Op2ZWApCmgpz6XZTGpxibnisP/WW8R0x2+v2B9SA= Subject: Patch "ARM: Spectre-BHB: provide empty stub for non-config" has been added to the 4.14-stable tree To: catalin.marinas@arm.com, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, lkp@intel.com, patches@armlinux.org.uk, rdunlap@infradead.org, rmk+kernel@armlinux.org.uk, torvalds@linux-foundation.org Cc: From: Date: Sat, 12 Mar 2022 11:39:56 +0100 Message-ID: <16470815969677@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220312_024001_097680_88E28D36 X-CRM114-Status: GOOD ( 15.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled ARM: Spectre-BHB: provide empty stub for non-config to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-spectre-bhb-provide-empty-stub-for-non-config.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 68453767131a5deec1e8f9ac92a9042f929e585d Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 11 Mar 2022 11:49:12 -0800 Subject: ARM: Spectre-BHB: provide empty stub for non-config From: Randy Dunlap commit 68453767131a5deec1e8f9ac92a9042f929e585d upstream. When CONFIG_GENERIC_CPU_VULNERABILITIES is not set, references to spectre_v2_update_state() cause a build error, so provide an empty stub for that function when the Kconfig option is not set. Fixes this build error: arm-linux-gnueabi-ld: arch/arm/mm/proc-v7-bugs.o: in function `cpu_v7_bugs_init': proc-v7-bugs.c:(.text+0x52): undefined reference to `spectre_v2_update_state' arm-linux-gnueabi-ld: proc-v7-bugs.c:(.text+0x82): undefined reference to `spectre_v2_update_state' Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Cc: Russell King Cc: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org Cc: patches@armlinux.org.uk Acked-by: Russell King (Oracle) Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/arm/include/asm/spectre.h | 6 ++++++ 1 file changed, 6 insertions(+) --- a/arch/arm/include/asm/spectre.h +++ b/arch/arm/include/asm/spectre.h @@ -25,7 +25,13 @@ enum { SPECTRE_V2_METHOD_LOOP8 = BIT(__SPECTRE_V2_METHOD_LOOP8), }; +#ifdef CONFIG_GENERIC_CPU_VULNERABILITIES void spectre_v2_update_state(unsigned int state, unsigned int methods); +#else +static inline void spectre_v2_update_state(unsigned int state, + unsigned int methods) +{} +#endif int spectre_bhb_update_vectors(unsigned int method); Patches currently in stable-queue which might be from rdunlap@infradead.org are queue-4.14/arm-spectre-bhb-provide-empty-stub-for-non-config.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel