From patchwork Wed Sep 27 17:06:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 145488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2777307vqu; Wed, 27 Sep 2023 10:15:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+AKXquu4GUKJj8WV8GaquJJOoCyOVitHp8eUEqrtx7LkwjcnvW+0Z3Ud/P/1GSVlb0jeJ X-Received: by 2002:a05:6870:41ce:b0:1da:ed0f:9c84 with SMTP id z14-20020a05687041ce00b001daed0f9c84mr3201754oac.52.1695834933416; Wed, 27 Sep 2023 10:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695834933; cv=none; d=google.com; s=arc-20160816; b=x3Sm8U+gj6a8kFj4lK0CHHhuZtPoqCPw/+CW9zGhxINFYVRXkxsRj8Azx1yQSdiFyE wMoeNZkllHNdbShzzuf7hp+4OO2uF6CqftUmG1YBapVVeI/RCbPno7w+jAWWnLRZdJFW it9wgpmCvzvTqsJnGHALVqksLvaltqLQfDv5wGGA+WvtgXGn1ioEXftI+gdpKQIR6gOj cD4UloEFrllpsqpnLRD7lLmn36S89FBXeVO8gnqpjBJGOFGnYgLIxlntJGebqN8jJiUo PF6/TlhUuy+7Mhk6949jwYJiHxEfiwbMJlQYRvDXMyDTz6wGD9C8twlWOD4uMPYgnlPs pEuA== 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=NyFoIsUvXEpd0WVmFVvKxDK2h6zKLOPxXto4Mc6nSpI=; fh=t2SPPfTSCl3Gg9zjlciSf5Z5yj2b9ZKOLcHC79FxYgc=; b=wENiSQS/sX6jAUY71HoP28rMhfsvGPwi8E+hlPjFtB6U/c6RfkDqdMGBqY/Imr3GL5 ukuAWFgfef/J8wgCawM+pf0vIdaL2yTbUDTLTrwS6Mm6vudxtZZ1SEUiMGAFF+eUqxtV yx9UaNh+ORb6RKOZjE7Tz81CBQwXc5eD9eyB2c/WuduC84C1oief8pRULxYUPsePKsHo ptX9dQ0iFpKuaVHNzWm/DNwQ/zzHxHVp/V29VkytQQ44q6Ipt5KPBRCMtZjVgumzKPgS RpjRm3x7sMmMj8nP/jBe3nW65oX2VYrOBpPgem23xFFTt1RdRDNiZVmxkf/Esr06JjLw I58g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Qdfg391W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id r17-20020a632b11000000b00578a56848a2si15874845pgr.648.2023.09.27.10.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:15:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Qdfg391W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 52A5F801D939; Wed, 27 Sep 2023 10:06:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229555AbjI0RGO (ORCPT + 20 others); Wed, 27 Sep 2023 13:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjI0RGO (ORCPT ); Wed, 27 Sep 2023 13:06:14 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5B7F92 for ; Wed, 27 Sep 2023 10:06:10 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1830FC433CA; Wed, 27 Sep 2023 17:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695834370; bh=+UG/yWZqZo1iV8TUQE3qhdJF0S1Q3YjrzyQjZVd6NL0=; h=From:To:Cc:Subject:Date:From; b=Qdfg391W2W7NBMk+m/EKVEc4PsWoYHrPd94/b7LiJLUlRCDPTFoJAq+2Ka3b9Blhf 45CmO9z2n7DEOGLXApOAnZ2gUZ2+8B1zF6dqIUmbkpyTaq5cSvTofUNxgGt5orqHsE RcM28LrsljFT1hdyyDuVn9f3G9JEajNh8ZTx5Yadl0IT1wJ209uJa69+R324nBzKgk n6u31bLwSv+SrbrlPc9VyCfNcCn3yrololUBn4y58e4Aor0/NosIGwmMlThKmzaOmY EW+z8ksqq1DVLgr02f3JuA6c7q6eMTEVVQW5qSVfJZ2fRnf1rYozlWD+DGYX49CS0D aVroXOfNICTjw== From: Masahiro Yamada To: patches@armlinux.org.uk Cc: linux-kernel@vger.kernel.org, Russell King , Masahiro Yamada , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: make self-contained for ARM Date: Thu, 28 Sep 2023 02:06:00 +0900 Message-Id: <20230927170600.286183-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 27 Sep 2023 10:06:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778211811041500172 X-GMAIL-MSGID: 1778211811041500172 When I compiled the following code for ARM, I encountered numerous errors. [Test Code] #include #include int foo(int *x, int __user *ptr) { return get_user(*x, ptr); } To fix the errors, make some asm headers self-contained: 1. In arch/arm/include/asm/domain.h, include for current_thread_info(). 2. In arch/arm/include/asm/traps.h, remove unneeded __init, and include for asmlinkage. 3. In arch/arm/include/asm/uaccess.h, include for might_fault(). Signed-off-by: Masahiro Yamada --- KernelVersion: v6.6-rc1 arch/arm/include/asm/domain.h | 2 +- arch/arm/include/asm/traps.h | 3 ++- arch/arm/include/asm/uaccess.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index 41536feb4392..d48859fdf32c 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h @@ -8,8 +8,8 @@ #define __ASM_PROC_DOMAIN_H #ifndef __ASSEMBLY__ +#include #include -#include #endif /* diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index 0aaefe3e1700..2621b9fb9b19 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -2,6 +2,7 @@ #ifndef _ASMARM_TRAP_H #define _ASMARM_TRAP_H +#include #include struct pt_regs; @@ -28,7 +29,7 @@ static inline int __in_irqentry_text(unsigned long ptr) ptr < (unsigned long)&__irqentry_text_end; } -extern void __init early_trap_init(void *); +extern void early_trap_init(void *); extern void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame, const char *loglvl); extern void ptrace_break(struct pt_regs *regs); diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index bb5c81823117..6a2cc57f015a 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -8,6 +8,7 @@ /* * User space memory access functions */ +#include #include #include #include