From patchwork Tue May 16 16:06:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94806 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp550037vqo; Tue, 16 May 2023 09:21:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5YRUO1R7tvPMenr2FKbv8wpPG3IWYjlUSMgipWMS0bOD7mS8AAucMgx4YtVeq1WOY/Xhxd X-Received: by 2002:a05:6a21:7899:b0:101:2dde:37b7 with SMTP id bf25-20020a056a21789900b001012dde37b7mr37103676pzc.11.1684254065084; Tue, 16 May 2023 09:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684254065; cv=none; d=google.com; s=arc-20160816; b=iJwrYV1/4FCJ47voEhUSW2uJ4qhH9g1i72viVqhHfdudsapDt5/pk4TUGs5jOH3slz 6cyrwyVN5p14wkqLIKWsLBnnmLqTIfOi4Ib9MznM+YtQVsXCkT+zKWNzQ9XUneskmZ8U QmH+PVWjvqA4nT6HKAfPA8oAw2DkhOMhTBQdqD61QMYQVWty8ulC8WlbjsW6XbN9swjV 4HF12JlnNXU2QEXRGc45ept206jmB9u/3duRTgptBCdvF38E4u7cfcsAS5VIgRrvG/g2 jPQrik+QOThgB0BOa/wuUN1bdi2Uv8rkJ0MoQ72PLT7jRS6SUqF2Z4ZTnQaPKzhzXKJb 2wsQ== 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=AH5tOVxvwNSUHkI31HjPUeBR1UcaKxudhcDzNjb+oU8=; b=yDrS7TaD88NSZnnBUI0FTTvDaqYBQ2wgpZ2OvARiUBdEaOLeqrGEYgkqdDYdo+cEjb 5FHjtIQgfNqtZzsn+rw8niy94o8qZn5rmqJbeT8u+lrZltLpxK9NtE+zuaG5Sdp67cky ZY/yw9ecRH2Qo0kFJ0PmJg8WFIVvZ4Ngn9gWRu3hAiNj4D5LlCPLhene3EncF0FoH8At 0j9/04SWHBRhTFovvK+RmWeDK0+wQIIlyy7vjHZdrXbVHqGUvP041JtM3O4hlLmzg435 V8829b3GIDyL0sXRATiipfZaCs6a6FftlKTBL3+bh45A+5hZgg4JoEZQqmI2WDP4fRbv udDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G2YspC5j; 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 d129-20020a633687000000b00525030ba5acsi19328796pga.279.2023.05.16.09.20.51; Tue, 16 May 2023 09:21:05 -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=G2YspC5j; 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 S234468AbjEPQJQ (ORCPT + 99 others); Tue, 16 May 2023 12:09:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234418AbjEPQIk (ORCPT ); Tue, 16 May 2023 12:08:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E64411BF2; Tue, 16 May 2023 09:08:18 -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 B70A763BEB; Tue, 16 May 2023 16:07:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C92CC433D2; Tue, 16 May 2023 16:07:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684253273; bh=h0fpkbLAOr0hALEk6kCEy5MAyU8tR08UpwZWaWzGWr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G2YspC5jTHUuOJUI4EhhBUyFCOOKFZLkbqD8w9Riw21cTSw3fKo729EaQIG7drJkp s7H4r1X18FAn3mK3PbP6eGqd4lmiZwH8emoPTvUbYIZ2yHGKzhg02SuTVrMl6NxFDu Qw5IHyESKe0mBsXwq4sFHGZpnlkrHlm99GnnwZa5monJzLE/ojsflhI390GG4PsKWP aYtkKc/WJRhJc101pMIaAlg60JJ3KO2ri2eJNR19r0Ynt/YelPVvaVbL6CM4fGm1Gn g+KT47Tvzsd/OhDaHS3u7Ruhw4FIwYik84yYUKg/MixP7GzLkx60SAFQuHfrUiphCG DHPcVcgCM29iA== From: Arnd Bergmann To: Catalin Marinas , Will Deacon Cc: Arnd Bergmann , Ard Biesheuvel , Mark Rutland , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Anshuman Khandual , Kees Cook , Suren Baghdasaryan , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, kvmarm@lists.linux.dev Subject: [PATCH 14/15] arm64: move early_brk64 prototype to header Date: Tue, 16 May 2023 18:06:41 +0200 Message-Id: <20230516160642.523862-15-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516160642.523862-1-arnd@kernel.org> References: <20230516160642.523862-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766068390250068964?= X-GMAIL-MSGID: =?utf-8?q?1766068390250068964?= From: Arnd Bergmann The prototype used for calling early_brk64() is in the file that calls it, which is the wrong place, as it is not included for the definition: arch/arm64/kernel/traps.c:1100:12: error: no previous prototype for 'early_brk64' [-Werror=missing-prototypes] Move it to an appropriate header instead. Signed-off-by: Arnd Bergmann --- arch/arm64/include/asm/traps.h | 2 ++ arch/arm64/mm/fault.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/traps.h b/arch/arm64/include/asm/traps.h index 1f361e2da516..d66dfb3a72dd 100644 --- a/arch/arm64/include/asm/traps.h +++ b/arch/arm64/include/asm/traps.h @@ -29,6 +29,8 @@ void arm64_force_sig_fault(int signo, int code, unsigned long far, const char *s void arm64_force_sig_mceerr(int code, unsigned long far, short lsb, const char *str); void arm64_force_sig_ptrace_errno_trap(int errno, unsigned long far, const char *str); +int early_brk64(unsigned long addr, unsigned long esr, struct pt_regs *regs); + /* * Move regs->pc to next instruction and do necessary setup before it * is executed. diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 5ccdba7132ca..940391ec5e1e 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -886,9 +886,6 @@ void do_sp_pc_abort(unsigned long addr, unsigned long esr, struct pt_regs *regs) } NOKPROBE_SYMBOL(do_sp_pc_abort); -int __init early_brk64(unsigned long addr, unsigned long esr, - struct pt_regs *regs); - /* * __refdata because early_brk64 is __init, but the reference to it is * clobbered at arch_initcall time.