From patchwork Tue Jul 25 13:48:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 125638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2506568vqg; Tue, 25 Jul 2023 07:22:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlHWb+SzdxyreyLUH50vzicMvLCxdutdi4R+1LXK0b5SKhviBfL/4WSP1XjZpNlJCtRihqW1 X-Received: by 2002:a05:6402:34d:b0:522:1f34:8429 with SMTP id r13-20020a056402034d00b005221f348429mr7701039edw.0.1690294938672; Tue, 25 Jul 2023 07:22:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690294938; cv=none; d=google.com; s=arc-20160816; b=oHut2UK2BEgsEcs6XeYnkWta+89RVpcvpPBis1CUcIM4NUxiLSA6lZ4hQbH/Bg5Yse u4e+ESpb96Ph3sCbOUXuuCHc3igN1q9QNe09sYMgGg1/yOFH4yELqYgF7ccKhuEqSxD1 0uJVjZXfO5wFVxgAiAZwwMt6jr+v+7+gZYAqYQ8c904KF3YuBKWC0BM+n2WfRIe/JbMn VvV1CskWU4NFqJ06AIGDzak5Q6WgdJjFs0RsuYplPxJvqZNGwgarwVp3d9Il+tA9uUyM EHnvt0amFTgrU7SQX/tTqlPQ+iR2/9CEOIq2+T8yVoq7AKEvh+oSj3iK6hn1MNeQI5lj Eb+A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mCgBfFRkM739Vc8/KWMQEM0FMilnMg5t6hA0333CXlg=; fh=R523ZnP4N7O48iGEbgKYBfM0eoofLeWRxo/bWq35Los=; b=oyRFJPiLWuHVm9UM7CqBbfMxc8ieOObIcOhyw2Ni87odIfMtPsugMUDkEm/Q/B0pJy ZJaI50bjqRY5IvRnjBH5VyzhXcNUbfm0IsMr3d7DhHl0bQsQxaUHThvtvmaEnhu81TqC yF98xzWc5y3KYKrl2w9SNm2sYTQKWRNY22+NZ0SKaZlmL/zxSlJ8ePHt0H3l5pHUVti5 LmQgYbWNdB2AKyG2yMQgdmWnoQ1u6oYsR6e7MKbVdTPEoNxisFh3JLVYFTOyZiB1K3Ic Xm2Liw0eR97pgrFVAn3OwtG/vay+adkY0INlcQ46Dl6Vcoa+u84lp0YB+h7Gj033xh0Y 1RbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=i30Mdi+O; 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 u17-20020aa7d891000000b0051e167b996asi7769325edq.656.2023.07.25.07.21.54; Tue, 25 Jul 2023 07:22:18 -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=i30Mdi+O; 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 S231650AbjGYNs6 (ORCPT + 99 others); Tue, 25 Jul 2023 09:48:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231569AbjGYNsy (ORCPT ); Tue, 25 Jul 2023 09:48:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8540211E for ; Tue, 25 Jul 2023 06:48:50 -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 7A83061726 for ; Tue, 25 Jul 2023 13:48:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1438DC433C8; Tue, 25 Jul 2023 13:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690292929; bh=hMCNeSXwQytHGCgIoVl9q90tknzoEJ95XhZLTksbe2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i30Mdi+ObSX/DddiqBUFhH+lrNYNyVlnliMlm65DvWNF9v2kMj2VV9m/gcmb+R6ai 8HVuAXnsFbIti0Faj2A23ZNut99GHsiE6j/CircdPswo/czk6DQQTa7wYYIi8jDwOj aW4tdUWW7pfW4aP5um+rivNwa7cSFbmNKwmV8VCqMpeFDRjqVVYWkGqA/F8rwO1K7W Wm22gPcB4XRbB/8COnoX2T7s3xWDzqLDzeh7M1bbnyFJOJioDs3PyJ+ArdIeHrGxgP DkSLapIDPw7U2FAfGflgDkIpkTpAqBRd3QW1Ocqaut/M3vhEASgsDctjiuiA/0bk3J M3a+lJo7K20Mw== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 1/5] [RESEND] x86: apic: hide unused safe_smp_processor_id on UP Date: Tue, 25 Jul 2023 15:48:33 +0200 Message-Id: <20230725134837.1534228-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725134837.1534228-1-arnd@kernel.org> References: <20230725134837.1534228-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: 1772402705890597098 X-GMAIL-MSGID: 1772402705890597098 From: Arnd Bergmann When CONFIG_SMP is disabled, the prototype for safe_smp_processor_id() is hidden, which causes a W=1 warning: /home/arnd/arm-soc/arch/x86/kernel/apic/ipi.c:316:5: error: no previous prototype for 'safe_smp_processor_id' [-Werror=missing-prototypes] Since there are no callers in this configuration, just hide the definition as well. Signed-off-by: Arnd Bergmann --- arch/x86/kernel/apic/ipi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index 2a6509e8c840d..9bfd6e3973845 100644 --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -301,6 +301,7 @@ void default_send_IPI_mask_logical(const struct cpumask *cpumask, int vector) local_irq_restore(flags); } +#ifdef CONFIG_SMP /* must come after the send_IPI functions above for inlining */ static int convert_apicid_to_cpu(int apic_id) { @@ -329,3 +330,4 @@ int safe_smp_processor_id(void) return cpuid >= 0 ? cpuid : 0; } #endif +#endif From patchwork Tue Jul 25 13:48:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 125652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2509213vqg; Tue, 25 Jul 2023 07:26:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlHLphYlT+Gb+PEhy7DXg2HHv0c+Eq42M+7nZQTxdTRD92+YB8Y9XN52LTqSj0qL9WzigjuP X-Received: by 2002:a17:902:a609:b0:1b9:de75:d5bb with SMTP id u9-20020a170902a60900b001b9de75d5bbmr14279065plq.7.1690295193197; Tue, 25 Jul 2023 07:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690295193; cv=none; d=google.com; s=arc-20160816; b=TXzYlxsmSVvysWNQt6nPNIO/ksJc4ZosUN3DMEuNxgIwYCFuTQTHYydtXbRC1kojnc 6rPgwfl+9BkginYpi/FBCQuJbK1Xq+tuJScKBmZFSHP+9299cjDzOYROwCTivO8ZvWdI l+fI3miNVIRLDheKqr5hkjLPTyQMQHhAifhWgcxnb7QUVbJlMUwEJfU+YaXL6KK120PA mEq8tSv4h2f8po80UAyETyn/JwRWxm0/NmQ9kzIXNYdTK6YYV2ctZSFPH3m2eUPyZxOM oyEGT0vdCbb0GflEneD7qPQggzxI4atAbOvBvWT+yIVh7fAlsBjhH+PgM7bGxigP9gBj kBkA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DbK5jx3TdIjIeKj44d7qh47lS9C9C5DVRxUFx+zjI2g=; fh=R523ZnP4N7O48iGEbgKYBfM0eoofLeWRxo/bWq35Los=; b=S0iMAbZ2TKIyDxI1FWmNQrj5tj5zF+YnIUZCkpOhhP+Gsd+UQe2A1j+nfu9e0JJs/Z JC5fjXONMGLutXCqK7yxMHAzTdJEViim+qXvvOAytv4zJ0Ovv/W48ojoIhyE5VGBEAtK mjN6t7LgsS05SpZ2r28P4z5lUKQEx2h4N1zlHhawvHL8iv8lzueISwMLHygApIP+snAY Z19YpqipiB/WQxlte8aiFoQw6muAJNWsheZEhGlJhvhyf03BXZJELscRMCR1C0QfhKIz 5Hd6vOFXqiSGXXXfSnY1Rpl6mJU9Nvn9u7w56TwX3yPkXMdhGFbjgrkndyAg3dooLh15 z+zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SFLrP4GF; 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 j8-20020a170902da8800b001b8946f3f95si12020830plx.312.2023.07.25.07.26.19; Tue, 25 Jul 2023 07:26:33 -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=SFLrP4GF; 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 S231679AbjGYNtC (ORCPT + 99 others); Tue, 25 Jul 2023 09:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231599AbjGYNs6 (ORCPT ); Tue, 25 Jul 2023 09:48:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78A531FD0 for ; Tue, 25 Jul 2023 06:48:53 -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 C5BB46171E for ; Tue, 25 Jul 2023 13:48:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 609C0C433CA; Tue, 25 Jul 2023 13:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690292932; bh=v5mmMDcLa9Qz+qTohnDO/9Jf2svRDFSXLGnLYI1Fcc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SFLrP4GFqOQh1yYxfBN3ODV9bJRXnvbtT/GzhtfnMr9ePZxfUcUQ5Tpbu6wCPpWiv DEWidaqarR3eOw48om02/LZ0u+9Rm8NttxomDfeRglYP1kAkaxYz8U7vwU952avJxp 0z4EZWQHx9tE+V6WXJWWFalOHebK3xkhBjtd+p7wxI3Nz22nLbokLkXvbWjdjuZ6zX bgiBdi+0YLD8sUs2wGrHHeDRn18ppYuUEwtRBChFKIc+vtRklup8j10Wj6oeDl6/vG WnGaZP7eTI80FgbsesszEcFL11NNEu0hhaHcJNQsehnI1n5xnpbjlio1NAwdRNFEdd QQjkIiZqz2AyA== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 2/5] [RESEND] x86: avoid unneeded __div64_32 function definition Date: Tue, 25 Jul 2023 15:48:34 +0200 Message-Id: <20230725134837.1534228-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725134837.1534228-1-arnd@kernel.org> References: <20230725134837.1534228-1-arnd@kernel.org> 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: 1772402972844053750 X-GMAIL-MSGID: 1772402972844053750 From: Arnd Bergmann The __div64_32() function is provided for 32-bit architectures that don't have a custom do_div() implementation. x86_32 has one, and does not use the header file that declares the function prototype, so the definition causes a W=1 warning: lib/math/div64.c:31:32: error: no previous prototype for '__div64_32' [-Werror=missing-prototypes] Define an empty macro to prevent the function definition from getting built, which avoids the warning and saves a little .text space. Signed-off-by: Arnd Bergmann --- arch/x86/include/asm/div64.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h index b8f1dc0761e4b..9826d5fc12e34 100644 --- a/arch/x86/include/asm/div64.h +++ b/arch/x86/include/asm/div64.h @@ -71,6 +71,8 @@ static inline u64 mul_u32_u32(u32 a, u32 b) } #define mul_u32_u32 mul_u32_u32 +#define __div64_32 /* not needed */ + #else # include From patchwork Tue Jul 25 13:48:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 125642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2508215vqg; Tue, 25 Jul 2023 07:24:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzVo14eENvOCG3UcCXN/YNVFNB/PuQuKUs5MSqVsp08e4Nn2oMBwvEE4VpubZJQV2KaYsz X-Received: by 2002:a92:c5c2:0:b0:345:c72d:33a5 with SMTP id s2-20020a92c5c2000000b00345c72d33a5mr2985724ilt.19.1690295097692; Tue, 25 Jul 2023 07:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690295097; cv=none; d=google.com; s=arc-20160816; b=XPgp3lgsVNVOsf127NHFkQana/UdRqwJTsDHGlY/gsQ8Bkwhc/D+zBZ5PTI7o6+PBB rq73QSM3wMSY1EnExwvuEjD+KMw3w6huQ0cTl54EGoEQNU2WdotkJnxxOsYfzlaj9s7Y WU9ZvvMgXKdGEeLzZz7B9qD3pBDBysn+MmOsPApAY1ESFFUfqKjK1lZVNxt+0oAjVBeM pdCbT7VZxKDjPwC8dhqOFqZms8RNFLOXrjlmG2rLWwUOyYxdzoeFz7JRI7YncFp9bUWP qc27nTHIe9fUw13SbzO0a55wLH/m9huTdqbNFF4fPnJ3rLQH1eKG4GU3je/7dOluq4n5 kRWA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0eJFoBUEqlcMqEzjmbCsdtFd3cn993QUXPzcR3NttrY=; fh=R523ZnP4N7O48iGEbgKYBfM0eoofLeWRxo/bWq35Los=; b=vr/gbkBnYh5dLEeHQcnT/ugdRQKB7doY1sxrWgR4QBDtfKmKiZN2+7CtAXPeBJEMuV Dsh9xXoR9LvuYC8sikpIQjwZnltx/xIzvRPzrCRjF3pvkJS9JhJ+vdoF2VlwYUa7vBmy Fm0w1jVmMfLItgXx5BRfZJHNmdjcPhgURtMwxZ2j5Cg0wD89UKV6ZFP8ClxObFvYAruw FxMOtJR1okZpsQpabuBg1OwMh/CwXGP5zyckD51FkGvuLLh36Vi8rxbTCFuK25JN8o1u bZh5Om0mWHJhQ6xyXLFlyht0ldaM8P7taTKAQeEGpRebsG9TotoxbNf4sDI46UtarQyB PmpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mAmJGHZF; 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 t13-20020a63954d000000b0055b2c94e7b1si11130994pgn.190.2023.07.25.07.24.44; Tue, 25 Jul 2023 07:24:57 -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=mAmJGHZF; 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 S231696AbjGYNtM (ORCPT + 99 others); Tue, 25 Jul 2023 09:49:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231674AbjGYNtB (ORCPT ); Tue, 25 Jul 2023 09:49:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 976E81FEB for ; Tue, 25 Jul 2023 06:48:55 -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 2C91D6172B for ; Tue, 25 Jul 2023 13:48:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC465C433C8; Tue, 25 Jul 2023 13:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690292934; bh=zYu6Qhej4I4I1hLCR7E73XOIiFQaNmUV38IfQaN/KuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAmJGHZFj2zo+lvyiyj2fARLACXKFwJ2boCMrtE7zfaYak3R3wGWKP6DvHA6vHc5O 0AIHxxPmMvavg9tB4Qhid7TvINrJXSsaSgJp6tcjqW/qVt5W1XEsVIakR10S+DWfRR NceH4hpvM8NmwIZciDhvbPlLN4WamF5VC9aIj+55ATUwLQ9L4hdgVB7JaB8awGJcEJ Td16jllJNdzKyTCfW7hCfIxoE/g67k2vV1LBjspYSymtn6H+gKtIgBBSquXU0TM24A ni6LFYe9rKhmt4GhCNqwpzOCw4uMqHNIN9iWTYkslCFwD7Hf6lr3RTbPxm3PHI+xTz t0Qh1KpUNFrUw== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 3/5] [RESEND] x86: qspinlock-paravirt: fix mising-prototype warnings Date: Tue, 25 Jul 2023 15:48:35 +0200 Message-Id: <20230725134837.1534228-4-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725134837.1534228-1-arnd@kernel.org> References: <20230725134837.1534228-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: 1772402872093849092 X-GMAIL-MSGID: 1772402872093849092 From: Arnd Bergmann __pv_queued_spin_unlock_slowpath is defined in a header file as a global function, and designed to be called from an inline asm, but there is no prototype visible in the definition: kernel/locking/qspinlock_paravirt.h:493:1: error: no previous prototype for '__pv_queued_spin_unlock_slowpath' [-Werror=missing-prototypes] Add this to the x86 header that contains the inline asm calling it, and ensure this gets included before the definition, rather than after it. The native_pv_lock_init function in turn is only declared in SMP builds but can be left out in UP to avoid another warning: arch/x86/kernel/paravirt.c:76:13: error: no previous prototype for 'native_pv_lock_init' [-Werror=missing-prototypes] Signed-off-by: Arnd Bergmann --- arch/x86/include/asm/qspinlock_paravirt.h | 2 ++ arch/x86/kernel/paravirt.c | 2 ++ kernel/locking/qspinlock_paravirt.h | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/qspinlock_paravirt.h b/arch/x86/include/asm/qspinlock_paravirt.h index 42b17cf10b10e..85b6e3609cb92 100644 --- a/arch/x86/include/asm/qspinlock_paravirt.h +++ b/arch/x86/include/asm/qspinlock_paravirt.h @@ -4,6 +4,8 @@ #include +void __lockfunc __pv_queued_spin_unlock_slowpath(struct qspinlock *lock, u8 locked); + /* * For x86-64, PV_CALLEE_SAVE_REGS_THUNK() saves and restores 8 64-bit * registers. For i386, however, only 1 32-bit register needs to be saved diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 89842bb7ec9cc..64a6bba70d183 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -73,11 +73,13 @@ DEFINE_PARAVIRT_ASM(pv_native_read_cr2, "mov %cr2, %rax", .noinstr.text); DEFINE_STATIC_KEY_TRUE(virt_spin_lock_key); +#ifdef CONFIG_SMP void __init native_pv_lock_init(void) { if (!boot_cpu_has(X86_FEATURE_HYPERVISOR)) static_branch_disable(&virt_spin_lock_key); } +#endif unsigned int paravirt_patch(u8 type, void *insn_buff, unsigned long addr, unsigned int len) diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 6afc249ce697d..6a0184e9c2348 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h @@ -485,6 +485,16 @@ pv_wait_head_or_lock(struct qspinlock *lock, struct mcs_spinlock *node) return (u32)(atomic_read(&lock->val) | _Q_LOCKED_VAL); } +/* + * Include the architecture specific callee-save thunk of the + * __pv_queued_spin_unlock(). This thunk is put together with + * __pv_queued_spin_unlock() to make the callee-save thunk and the real unlock + * function close to each other sharing consecutive instruction cachelines. + * Alternatively, architecture specific version of __pv_queued_spin_unlock() + * can be defined. + */ +#include + /* * PV versions of the unlock fastpath and slowpath functions to be used * instead of queued_spin_unlock(). @@ -533,16 +543,6 @@ __pv_queued_spin_unlock_slowpath(struct qspinlock *lock, u8 locked) pv_kick(node->cpu); } -/* - * Include the architecture specific callee-save thunk of the - * __pv_queued_spin_unlock(). This thunk is put together with - * __pv_queued_spin_unlock() to make the callee-save thunk and the real unlock - * function close to each other sharing consecutive instruction cachelines. - * Alternatively, architecture specific version of __pv_queued_spin_unlock() - * can be defined. - */ -#include - #ifndef __pv_queued_spin_unlock __visible __lockfunc void __pv_queued_spin_unlock(struct qspinlock *lock) { From patchwork Tue Jul 25 13:48:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 125630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2488030vqg; Tue, 25 Jul 2023 06:59:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlGiPS1uSjZDx5ViRkBOzS2Hirl1j0KQr7WChe6l2GO/BkRLKTHSnJkOSrOezpQwXEu71a6I X-Received: by 2002:a05:6512:3242:b0:4fd:c762:722c with SMTP id c2-20020a056512324200b004fdc762722cmr7074031lfr.19.1690293546629; Tue, 25 Jul 2023 06:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690293546; cv=none; d=google.com; s=arc-20160816; b=Ix0144YjCFh3BjQ5DZI93icza3MrWqw+/sHaimnS6bhjPy2mCuRWjGeJXc52rCoHmn AiwW6wjvMBO19NKjeJHNiYvlSGO3uDU+KO+2cxL8pDISchw5gob5PDYwY6fZUmPY7tVC YwBpJDLycIc6qa8E/khU3TxQAySnnDXBKo1BSDfNXVUubpJszaMNexkYA8ENMYdI5/mC TGdNqg00tcKjJ1+dIxE6fcPFaZdNgMjsuyoMB56Y3Z5nSPSKSE0xDngd7gC/LX01pgVq WAHUjxdgpuCyxtZuitNc+zJ1SOtgkypNwNLEdPdeXvFqwP0Px5Sj424Or/U/oq/Kfesf 5g6w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LRhsHgUsRHK8N/Uf/5iQjmoXkEzplKU7aLwK1K5jM3o=; fh=R523ZnP4N7O48iGEbgKYBfM0eoofLeWRxo/bWq35Los=; b=lal480i+EIh+WYiZagEXRXb2pppTvwRkeA7sykJ94zirXYsR3c3Kv+lmsg/feoaPhS 7z3Evrp7xU+k9F9lHdC22tNTsCo2TGoqFMg1OZ9nH+z5j68zXUQk+BA+WwmS0Roq5wvH +JQX5VS5GykXomj3lmqXnDmo/Q5pvJM/mbGxfey2ytP3FeEBD1yRMzVVKlBwzeqPR+ZH VkD2N7vLJ8QANIA1IN5mE0Oti/Cs/a+1w3aveYkslIT9R9TiY6hPtWyJySU/nGYBAgxv YEJP9n+PzPUMSIB0/XO2yOfEEmjUarZD/hneTZZRGmpx/BJC70fw0jlkxSO9hDYjoTo3 NRdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E5EJ5sFE; 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 d24-20020a17090694d800b00992bfd00fdbsi7785920ejy.971.2023.07.25.06.58.40; Tue, 25 Jul 2023 06:59:06 -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=E5EJ5sFE; 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 S231663AbjGYNtP (ORCPT + 99 others); Tue, 25 Jul 2023 09:49:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231704AbjGYNtE (ORCPT ); Tue, 25 Jul 2023 09:49:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3F241FF7 for ; Tue, 25 Jul 2023 06:48:57 -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 7A84C6170C for ; Tue, 25 Jul 2023 13:48:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E522C433C9; Tue, 25 Jul 2023 13:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690292936; bh=rn5AmJ5E/u7lh73YUSkNYYV834iPfRhN7MTY5kuEYCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5EJ5sFExzL+l6ZHXgg7hLHU7rqWQA/ZT1COpzpppHrOGcDkiH6orSN/Rm9g/Rspz X+mTZwvX7S10EtizGzoOqonpuVw12/qXHokPsgiyabe1j0THXHLqdkkUguxVBaUbPJ 9gzfJh2FG3ThHGVj/PGS+eB3U2V9/vnIICo2dpFUBZ/q8MnRtu2pGNNoIoia+2+eqS OG8ETn9mz2HduZMTeoiRW54UED6y2Ewu8T8bcZ7tvmT3cCkaxBv6JfJ9A2CScDc6xS ZFv0SlajI3hptFRrcSxspED7h8hLREWIa28NpE4guqJF91O+vmUmPyjibDxPS0GEoo QdjeVM1AmT3yw== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 4/5] [RESEND] x86: purgatory: include header for warn() declaration Date: Tue, 25 Jul 2023 15:48:36 +0200 Message-Id: <20230725134837.1534228-5-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725134837.1534228-1-arnd@kernel.org> References: <20230725134837.1534228-1-arnd@kernel.org> 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: 1772401246036650773 X-GMAIL-MSGID: 1772401246036650773 From: Arnd Bergmann The purgatory code has uses parts of the decompressor and provides its own warn() function, but has to include the corresponding header file to avoid a -Wmissing-prototypes warning. It turns out that this the function prototype actually differs from the declaration, so change it to get a constant pointer in the declaration and the other definition as well. Signed-off-by: Arnd Bergmann --- arch/x86/boot/compressed/error.c | 2 +- arch/x86/boot/compressed/error.h | 2 +- arch/x86/purgatory/purgatory.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/error.c b/arch/x86/boot/compressed/error.c index 5313c5cb2b802..19a8251de506a 100644 --- a/arch/x86/boot/compressed/error.c +++ b/arch/x86/boot/compressed/error.c @@ -7,7 +7,7 @@ #include "misc.h" #include "error.h" -void warn(char *m) +void warn(const char *m) { error_putstr("\n\n"); error_putstr(m); diff --git a/arch/x86/boot/compressed/error.h b/arch/x86/boot/compressed/error.h index 86fe33b937154..31f9e080d61a8 100644 --- a/arch/x86/boot/compressed/error.h +++ b/arch/x86/boot/compressed/error.h @@ -4,7 +4,7 @@ #include -void warn(char *m); +void warn(const char *m); void error(char *m) __noreturn; void panic(const char *fmt, ...) __noreturn __cold; diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c index 7558139920f8c..aea47e7939637 100644 --- a/arch/x86/purgatory/purgatory.c +++ b/arch/x86/purgatory/purgatory.c @@ -14,6 +14,7 @@ #include #include +#include "../boot/compressed/error.h" #include "../boot/string.h" u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(".kexec-purgatory"); From patchwork Tue Jul 25 13:48:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 125655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2509721vqg; Tue, 25 Jul 2023 07:27:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHlhMwgCkJGXjEZ6xLvvild4gOnQpWevWlDGb12psgB58f4cEnMwLn6k5xb1EspX+bpqfyQ X-Received: by 2002:a05:6a00:1785:b0:67a:9208:87a with SMTP id s5-20020a056a00178500b0067a9208087amr10943550pfg.23.1690295240378; Tue, 25 Jul 2023 07:27:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690295240; cv=none; d=google.com; s=arc-20160816; b=XdPNVztCqmx0+0w8UU1TUkCURcwwxAK/W5CkuAUWxNVj4H4uGNGMh4rVIkWBvXzaE2 ZQrWn4jl+9+PkPVGtIeaUJbSXQogX549BNyfOHYGYoPy8Sy+JPhQ6Wc8bq18q1dykLmG ynI2NhVZ186P6fkc6mq9a2nBH/hgNP7ee1x+075dnUtlCqzEl3kx5Edptwc8opkLyBK8 OxDzWf0DiMHiNOHA5qKqJSusIZP5/Ib8s755pIxBtuedJTAatZdbhfLes9FFk9iKKPp8 49NJ/tIK6CizcBaY3/oyxcjebYAuNthY5eAH85hudStHzB5sThNnwF9siSBGHH8r/QLc LPCw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bB2sLG/gzHKKcq6ryWYls7V4smHn+D8QtUR/URuRdRw=; fh=R523ZnP4N7O48iGEbgKYBfM0eoofLeWRxo/bWq35Los=; b=d8FlgK3N7A8Ou5Wcf5K/En9HYt1/oLaMln7fji5VSB5m8NybvCEqvvxcXc8pb+vhRv SDPqqZMR441aIxlpQJ31xIUXCzX5uQAjskIq4e+apSVmolEctZ7HenzpVtMXmGpTFPpB yep+aalqCPtcE5YNw55iyezpZCBrzz1C/SDwvBHdtsdiAKsX/g6xRVvGFAm1EUJbUzND 0Re+C9v3H02tPSHYUo6fdMkJ18ax0BJ49xCNAEJRkNu83r1MLHBSGEh7FXyKKJS4w+di Lif78qnZ7ibaID2brdgRCAERRDJ2PTAU2LaYPx2s5I6OiJwPR4YRICkq16OzZNrL94Vv SPSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vE7vE6PJ; 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 z3-20020aa78883000000b0068254b9108bsi12077406pfe.71.2023.07.25.07.27.07; Tue, 25 Jul 2023 07:27:20 -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=vE7vE6PJ; 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 S231833AbjGYNtS (ORCPT + 99 others); Tue, 25 Jul 2023 09:49:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231705AbjGYNtF (ORCPT ); Tue, 25 Jul 2023 09:49:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0915C1FD2 for ; Tue, 25 Jul 2023 06:49:00 -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 DF27A61731 for ; Tue, 25 Jul 2023 13:48:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64BA9C433C7; Tue, 25 Jul 2023 13:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690292939; bh=KR4z8QRNi4pU35qpz87mdf60pT5ISebScYvNacq6P6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vE7vE6PJe7HILM6w/tgBd1IsUX2Xx7oEqB4YQ8IKOIcVIOTIhmuACww1CQj9PNcMq RLjheYQNOGg1H3Yl+pt8m2rAI5PZf5kNaYJqkO3ASg39hbLfYuUzURuNqnWtS9ytBj 5Lc0azinLfILioCypLzIoq4Uhb8bR7KUqT2fRlntK1JsD/DjXBP/FetJeESNZ/DrXP a8vObFOA/vJ/Cv/yTPblLMCwpNHHtIkjnVVHbT/Yz0zk9mXs/cSBHXCm6MniKCTt1d bXWWw0ZNhxwjr7pXYJos2EDdgVyyIDyPmZGX5rYCEJK9MQELoxIBkGtgYv+rE5w/PL WyPb1SztVEhyA== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 5/5] [RESEND] x86: alternative: add __alt_reloc_selftest prototype Date: Tue, 25 Jul 2023 15:48:37 +0200 Message-Id: <20230725134837.1534228-6-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725134837.1534228-1-arnd@kernel.org> References: <20230725134837.1534228-1-arnd@kernel.org> 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: 1772403022047716980 X-GMAIL-MSGID: 1772403022047716980 From: Arnd Bergmann The newly introduced selftest function causes a warning when -Wmissing-prototypes is enabled: arch/x86/kernel/alternative.c:1461:32: error: no previous prototype for '__alt_reloc_selftest' [-Werror=missing-prototypes] Since it's only used locally, add the prototype directly in front of it. Fixes: 270a69c4485d ("x86/alternative: Support relocations in alternatives") Signed-off-by: Arnd Bergmann --- arch/x86/kernel/alternative.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 2dcf3a06af090..934c23f24a3f8 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1531,6 +1531,7 @@ static noinline void __init int3_selftest(void) static __initdata int __alt_reloc_selftest_addr; +extern void __init __alt_reloc_selftest(void *arg); __visible noinline void __init __alt_reloc_selftest(void *arg) { WARN_ON(arg != &__alt_reloc_selftest_addr);