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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6F20C433EF for ; Fri, 11 Mar 2022 19:18:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351051AbiCKTTd (ORCPT ); Fri, 11 Mar 2022 14:19:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351042AbiCKTTa (ORCPT ); Fri, 11 Mar 2022 14:19:30 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 086F565D21 for ; Fri, 11 Mar 2022 11:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=J3NJVjWyKNpGT7siMqPZJ6BO7MwoPQt1ghuD0mMQpDU=; b=js7kcNeRXz0/8UxYFWNuT8JAwC T3p5pYhe5Zb60f+przqDmp7opHk/zHt/g5O0BVFTJviEZcq7z+/UAZ2UZubslEW99z8MR6/+/sozq oMjO47Gh3mcbB82dSj6kx4QmC8P00AG9EVW6qnZOjmuGXHJizCPCOwE0lg+e1e+NoXbrTzLM3zBDy xPcHdIxafuy2NJsz4a+zFwnM4Eexi1f7A8MXkFxxlFHRi94m1EmU626ccx9d0i5Oel0U0Dh9paNwd nWkoNRTOGJsuZv+k7ZPrQo5HKM9NAaHXsqLRQzM92JQBWY+RBCkyG9AQiENuEX5gs5uIZtgp9OdEv zKCI24rA==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSkmN-0004z2-1s; Fri, 11 Mar 2022 19:18:23 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , kernel test robot , Russell King , Catalin Marinas , linux-arm-kernel@lists.infradead.org, patches@armlinux.org.uk Subject: [PATCH] ARM: Spectre-BHB: provide empty stub for non-config Date: Fri, 11 Mar 2022 11:18:20 -0800 Message-Id: <20220311191820.25771-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- KernelVersion: v5.17-rc7-205-g79b00034e9dc arch/arm/include/asm/spectre.h | 6 ++++++ 1 file changed, 6 insertions(+) --- linux-next-20220310.orig/arch/arm/include/asm/spectre.h +++ linux-next-20220310/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);