From patchwork Tue May 16 15:46:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp542623vqo; Tue, 16 May 2023 09:10:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4QyOiPljfL9Tm5rHAWAd4H3GXqCQEkqxyA6ho53LYlzgPiXZIgWRHW+eqpdgZLfVHSWLcX X-Received: by 2002:a17:902:ecc5:b0:1ac:6882:1a6f with SMTP id a5-20020a170902ecc500b001ac68821a6fmr39397363plh.30.1684253432849; Tue, 16 May 2023 09:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684253432; cv=none; d=google.com; s=arc-20160816; b=w3WWcjegqjlhdAOgDqT9xSLisLA1SbQSeq3idXHhephDIgkTNnWUUKpTTua3hdCtws fP+s7f4GI4O8F72VLdXvE7r91dXmqpqxHkY4XG5aGfDlipjryN58WwdCwJ6tCnfOedK3 RFsYhf2bahvUxyCbhTDln0Vo1+goKA0GsIlEztZQferjcPs8c4lH1slKPs/AVCTeuvAp mQxBd/33WKuw9WvI8mK9tCRi5rd8Co9U+WxrGpzVHi4Kbg7zQCNERb5CyHDkzivqZukJ jKjeQH6ogthxwq9ZM1aFbSlmHCIEk2vAkOMteHNLdbbi3yklm7aahxxUvG1gjeO0ujiX MJpQ== 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=UOClFn/Nr+oJWMPe5meMviOzQugBqSNql4yHoccQk84=; b=AyjaP9SHE80z6MOT7M1sT2T9NDVvQeQgYacoj3JEOE65ojmrWyNly+Bi6x8c+WPJSz tud30S8CVqbaE/MjSz22IulaHZklAod7iVIKuMWPwbhtNEp6BcRV0zv6NB+JwQDVBvhi xZ4Ef+5PQQ1bsu+tlhbD2uUiN8t7Lhxm4cSLeqR0wNo0/T5qWExkINqPu3y0D1ZB9WQ1 0VztYEQfey2jZUgJxu4yg1Mon5tQhCHeBVCKEGII3+f7P3AKSbwnFKlQhixnknY8FVWY 1r02SnmrJT7skOYj6wqsaqlEdpNr+Vx5BZhVAFmdnJMSru25IHVP3ArmDNrlV9aBpg2q VS2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f2bOGMma; 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 iw22-20020a170903045600b001a63b8e071esi17639002plb.28.2023.05.16.09.10.17; Tue, 16 May 2023 09:10:32 -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=f2bOGMma; 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 S234228AbjEPPsX (ORCPT + 99 others); Tue, 16 May 2023 11:48:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234205AbjEPPsC (ORCPT ); Tue, 16 May 2023 11:48:02 -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 81A84A24D; Tue, 16 May 2023 08:47:37 -0700 (PDT) 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 BDB6663B93; Tue, 16 May 2023 15:47:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0070AC433A1; Tue, 16 May 2023 15:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684252035; bh=bjHzaX1S/XmMHS+pzx/BBsDEPRhhS8ndqsq/8qSoq9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f2bOGMmanyE84V2/AE41WTMs80qf9pTZsHsD9F+/Ran0Loq1XnTWD9T1Xe/lEKv2Y 26KXijopJ1VoF2HSPy2rDYc4XU/QPS+Zund7IVhGRxHNHw9vNTL86eH4s8XWVe+esJ GHxnqexAf5xknWy4Yonsml33IdsEstRyKq9sdNqaIejoDb1g5MSmONOYCsanOthNKJ D+QslLecnNSqmq1ph9lvme/E4S0LiZmiQg9qzXyrdadHTL+NCJjLLu6zxCWjXyvqVt 4V5sahVD0mThIJeYsb2Qctrjw2FfeAYZ7OWb+ewqVNJiWbDv2ZF8YlLIH2bOXWAWg3 rAlpSAzcEWEKg== From: Arnd Bergmann To: Russell King Cc: Arnd Bergmann , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Oleg Nesterov , "Rafael J. Wysocki" , Pavel Machek , Linus Walleij , Ard Biesheuvel , Kees Cook , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 16/16] ARM: xip-kernel: add __inflate_kernel_data prototype Date: Tue, 16 May 2023 17:46:05 +0200 Message-Id: <20230516154605.517690-17-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516154605.517690-1-arnd@kernel.org> References: <20230516154605.517690-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766067727315557512?= X-GMAIL-MSGID: =?utf-8?q?1766067727315557512?= From: Arnd Bergmann The kernel .data decompression is called from assembler, so it does not need a prototype, but adding one avoids this W=1 warning: arch/arm/kernel/head-inflate-data.c:35:12: error: no previous prototype for '__inflate_kernel_data' [-Werror=missing-prototypes] The same file contains a few extern declarations for assembler symbols, move those into the header as well for consistency. Signed-off-by: Arnd Bergmann --- arch/arm/kernel/head-inflate-data.c | 5 +---- arch/arm/kernel/head.h | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 arch/arm/kernel/head.h diff --git a/arch/arm/kernel/head-inflate-data.c b/arch/arm/kernel/head-inflate-data.c index 89a52104d32a..225c0699a12c 100644 --- a/arch/arm/kernel/head-inflate-data.c +++ b/arch/arm/kernel/head-inflate-data.c @@ -8,16 +8,13 @@ #include #include +#include "head.h" /* for struct inflate_state */ #include "../../../lib/zlib_inflate/inftrees.h" #include "../../../lib/zlib_inflate/inflate.h" #include "../../../lib/zlib_inflate/infutil.h" -extern char __data_loc[]; -extern char _edata_loc[]; -extern char _sdata[]; - /* * This code is called very early during the boot process to decompress * the .data segment stored compressed in ROM. Therefore none of the global diff --git a/arch/arm/kernel/head.h b/arch/arm/kernel/head.h new file mode 100644 index 000000000000..6eccf98fc2cc --- /dev/null +++ b/arch/arm/kernel/head.h @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only + +extern char __data_loc[]; +extern char _edata_loc[]; +extern char _sdata[]; + +int __init __inflate_kernel_data(void); +