From patchwork Mon Jul 24 12:18:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 124904 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1765583vqg; Mon, 24 Jul 2023 05:29:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHG0sMaLyfc1v7ubTmYMXwA2SXbUAvYbtpkEH3Y1HknN1o/mCASGNSQ9/lCBf7i/zlY/7O X-Received: by 2002:a05:6830:188:b0:6b9:91da:484f with SMTP id q8-20020a056830018800b006b991da484fmr8844668ota.27.1690201781514; Mon, 24 Jul 2023 05:29:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690201781; cv=none; d=google.com; s=arc-20160816; b=Zz0Nm8OmLs4NFXl1ngPhyxJzP4hBRiAqdXU8rbqRngL/iWxE1TIxclHi+kuDDEp1zE v/hwHGFkj3RwluSovC5Wk1kvVjxFQde3biQUpibn1j5bLb4pqpWppDRg1VzwiTq3Gnt2 s2FCZpo8PrzzAO3Tgzbk9F1mfqcQ+FH8pOpXxiLRc0EFBbZ9qOAFk4Z5QTfUSuST1NUO JLQLd2JSq4gSTbrnByR37Qn6t+XxvFc0ALlq3a1bBzxHGBIUp4ZyoUpW5ZDbLTQ/cTD6 jVWMN4L/Udg5LYDxiLlQ7iF0a+8v861W4Kk65W1Jii+WcQQUcsFfvCDQVCSyTYJ8vWIJ zzcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=3urti7BWAfHo/Fq3Y9HOEwEWVkCF9QXxPyVTS57NQ2Q=; fh=FMplZMvWjWpfZVLThALWCL2U5uflM9k9VdJ7onn3pTM=; b=OWPUWYsKg6KMQ1zXxuPIj/TeJL4mbaCbmdP+syEwdWSaU+jZYlZHyDJpTeV5NUAGi3 6ulUvnQYK4vZbtv6kTHBJPDDmL47BomjTv9CHsfWWN5uwULu6bLkFcI12WUM9LWJF5iK x2fZXGwLa5+H7k8MuUtSpW5j//Ij8oLdMOmTumgTI/vuJB+M+ul4I9t2JZ4xe7q9vCrx wLbPYSAzgpDUFyiGEAyqtZDCrEzkKJXi6V01ggBEaR0/QA64yNjQM6y0Wye8n0cBdglJ H0AnbsPSCpcUDxLr6UjoEJJh5rWy6Xov9B7v1IPlY6xfnXzpXo+KhGwdwRlkGBB5zQFN ag+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kw8PsT3w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k190-20020a6384c7000000b0055b3d494058si8956242pgd.23.2023.07.24.05.29.27; Mon, 24 Jul 2023 05:29:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kw8PsT3w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229945AbjGXMTp (ORCPT + 99 others); Mon, 24 Jul 2023 08:19:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230419AbjGXMTZ (ORCPT ); Mon, 24 Jul 2023 08:19:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EED2171C for ; Mon, 24 Jul 2023 05:19:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3D1A961137 for ; Mon, 24 Jul 2023 12:18:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30F63C433C7; Mon, 24 Jul 2023 12:18:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690201136; bh=YzbNbz001bsuZJHb7mliu62Hj7vauK4wh8AaumbnPAA=; h=From:To:Cc:Subject:Date:From; b=Kw8PsT3wtcqo4pvvE99Z0kL7peS/vy7EfU+HWuVYfFptTDPAL03xwb0JVD23cTGUJ iPS2bCnYfoz9bf1LswQ9Qqan3kXSa6UxGHTuKl1kDlVGa8N7wKdsbYjEl/Oi1tcuMA xBl74bjrLa+Mf7Q5++Q4WFWLK0jePgn6Lqny9mfV7Pt1B5aEmDVDMneFBCZ4voyzjg 4pp7lZqJy5Dpvboryz3uoAlyXLMaUdGfDHVL8EyOvvhGzy1VqX2A9bq4BdCTfbbvKf 1q5WSQzv/86GNfImKaIVJGYMnlPZCuLB1wxxv9jilgFlDfKX2O3oB+Sfv6EgxrXFmU viRu/dmvHxVFA== From: Arnd Bergmann To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Mostafa Saleh Cc: Arnd Bergmann , James Morse , Suzuki K Poulose , Zenghui Yu , Fuad Tabba , Ricardo Koller , Quentin Perret , Kalesh Singh , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype Date: Mon, 24 Jul 2023 14:18:42 +0200 Message-Id: <20230724121850.1386668-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772305023163287765 X-GMAIL-MSGID: 1772305023163287765 From: Arnd Bergmann The kvm_host_psci_cpu_entry() function was renamed in order to add a wrapper around it, but the prototype did not change, so now the missing-prototype warning came back in W=1 builds: arch/arm64/kvm/hyp/nvhe/psci-relay.c:203:28: error: no previous prototype for function '__kvm_host_psci_cpu_entry' [-Werror,-Wmissing-prototypes] asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on) Fixes: dcf89d1111995 ("KVM: arm64: Add missing BTI instructions") Signed-off-by: Arnd Bergmann Acked-by: Marc Zyngier --- arch/arm64/include/asm/kvm_asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 7d170aaa2db41..24e28bb2d95b6 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -278,7 +278,7 @@ asmlinkage void __noreturn hyp_panic_bad_stack(void); asmlinkage void kvm_unexpected_el2_exception(void); struct kvm_cpu_context; void handle_trap(struct kvm_cpu_context *host_ctxt); -asmlinkage void __noreturn kvm_host_psci_cpu_entry(bool is_cpu_on); +asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on); void __noreturn __pkvm_init_finalise(void); void kvm_nvhe_prepare_backtrace(unsigned long fp, unsigned long pc); void kvm_patch_vector_branch(struct alt_instr *alt,