From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18403C636D0 for ; Sun, 29 Jan 2023 12:43:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6E016B0073; Sun, 29 Jan 2023 07:43:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A451D6B0074; Sun, 29 Jan 2023 07:43:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E6876B0075; Sun, 29 Jan 2023 07:43:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8006D6B0073 for ; Sun, 29 Jan 2023 07:43:11 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 53D59A62EB for ; Sun, 29 Jan 2023 12:43:11 +0000 (UTC) X-FDA: 80407801782.23.F608CA5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf07.hostedemail.com (Postfix) with ESMTP id A60D040006 for ; Sun, 29 Jan 2023 12:43:09 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UOlDKwso; spf=pass (imf07.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674996189; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hn4uqFnw1MpNZhoSRz5qWAvlShkpLY3aict1kuPnWDk=; b=O7wdAt8Yg7rt2HqH5CNUddYP9C/Py/veSYWjKBig9YPx25xmJCbCek8i3RSuV7LLkU/NoH R1H/XQ6aqqIHKS4pbZEX7BqEX1xvUAaPoWdk5fevELE1JNBFeAjIuWg4ur4FUX7tJotHg5 YlalY161WzCKy0i/6lvpzz+OKjaZmyM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UOlDKwso; spf=pass (imf07.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674996189; a=rsa-sha256; cv=none; b=fR3ef4sAks79j3xtMzIlWlkv2EYdv1D/TgSGjNijGxpLidgfcwhRzh5pS08qJa5ba2SkXG gBTYrtoCXLi58ZTN6Y5vfbpVTEjrb8lxmzaEXnjzUqvuZc34vSiqhb5ihmB5KjAZAJZHiG wspfhVNIZghgzldQNVR6HyUqspMtnOw= 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 B6AB160D3D; Sun, 29 Jan 2023 12:43:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52C73C433A7; Sun, 29 Jan 2023 12:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674996188; bh=cgWDMwNotrvgtwLOXkxr022OhYpC4uBm5qKZZMTCdc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UOlDKwso6wRfZVylh618GS0Ouplr5vx0EbZPPHD3xUb+8QoPpiFEHadR57onqorCd YVV0X4T7n8gLAlDCcDoHkjHy+WzsJoiwhi5dfYlZ0/SJbhBTB4CLpq8O6xDe8ABdAj ibLF/6hCOLr13VOj/azi035hOFFfeFmuDXjRvCo9nQzUAZ1DneDknyLVqg+z3u91Hb JSM0yS+mjSe2REo/FRs3DbdIX7npqpWYBVELIqlPxuJWRXDIEj2eP/ud0TKhe2R7e/ shdVeHbLA/9GwBZjKAbCX1zbNI+chUKkqGr1E/I9bnpduDb0l68n12sXR48UTQjqrn 2HPElfopuZj9Q== From: Mike Rapoport To: Andrew Morton Cc: Arnd Bergmann , Brian Cain , "David S. Miller" , Dinh Nguyen , Geert Uytterhoeven , Greg Ungerer , Guo Ren , Helge Deller , Huacai Chen , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Palmer Dabbelt , Rich Felker , Richard Weinberger , Russell King , Stafford Horne , Thomas Bogendoerfer , Vineet Gupta , WANG Xuerui , Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, x86@kernel.org, "Mike Rapoport (IBM)" Subject: [PATCH v2 1/4] arm: include asm-generic/memory_model.h from page.h rather than memory.h Date: Sun, 29 Jan 2023 14:42:32 +0200 Message-Id: <20230129124235.209895-2-rppt@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230129124235.209895-1-rppt@kernel.org> References: <20230129124235.209895-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A60D040006 X-Stat-Signature: rbdztezuf6ux9xw1gsg4ogysj8afe1o9 X-Rspam-User: X-HE-Tag: 1674996189-548044 X-HE-Meta: U2FsdGVkX18yrnFecWCA8VMOvwKSHAU92Z8u1pJCVKrT52QFB5ZfgiOtl/c1cVRwhztEDCqIcO/uic22FF14BbPjveb/eE6hwnQxA+OHzvpWXJTItzrce/t2wxHHIMzMpmCrjKwNbgfYsWsgOoOyF5j6ATeBnd3Mt70iJj119AnVc1N4avKn4KBfy4O219ycTdZnKKtL7rriw6MTYG00wlpNe7on3+kDRuwkSwwMqARaBhFhIizaDxvNGqjxS6nOvhuxfVv4sW4Px/GPwEKd9JFvQTQp6f5kLNmMweTTWk9O/Nu+WmQyAxdiHNaqXgSxfXbY72qLik9+0yZDc1fvuxZXRmgStqR67/soIOoArs5mKdvnvA7u52+/yXsWOwC86SR3oIoGZgWgSxdgpNs1/teED7oOdDjLaiC6aCSu5kmzE09uTMixmqBmNi1nnyH8bovYVV/SRQ/Tu4nnOq0ENFj8NYWWUla883uR7IFE1e4IY5dg13dC+2kztT82/vpzzFczFIxLdwqQqdIqmnRWWKaaplti1kz3ag16HNPjjo71FBPjW1BupSi+QVppQlux4gqlJSNHSVo5LiRWZOA60x3YnF9CJvYQvhzdahJso0fkQblmasWp811pd+LO5OJVhJyLLaK3hte10yzgauam/HudPUneVsApKQdvqbKzh6+bMQzfozK3/21RDHHcCMEPtu30q80XjuE86y7L4mZTezXhGQjnw4SQllfvH0pRHPfRBWVzIbAS1EO6NJ0eyvzbxOLhPmZmqG7R6CXiUnzIDUGGDnF1LmSOBMAVdaI/GqhtN7iFUL4BcQqjpeDc1aYqsHHO5f3MZ7LmI4aYJQsLNniEalqEqs6Q6SFxYsD+4Rq3wtOx8ZpzHNvQlqyAzqD7DergRpSpW+3OPRlvdO7UWS4FNZKEXbDBMSNisR9Q5v6l4rRhyrKIL7PU5VKhcW9Qnfg+mQZVE7O8dcnlYm+ MPdhKyaL prnvjRnKuh9sO/MVzXRQj+vDe8wG5eWnYnBEJm+D7Yz2I7H3gK1Tk6EMUYfEL+iNeSDaqgkfTnfQmcEdNAoVM3lVkA9fWtnOPuYIaSBEIvJpr5D9lRaaBBpdiz+nQMZfA9V3C8gotaJDHCEsyxPJEZ59w1DDc9EeYWZQkoZ5k0veqRpa332lqRVShSbq9TLZxahqn4boSAGNJtD6MVZER3q1HdAFf1j9l0vRB9ADySRKLXaQP470CFdBycCjePVBKnQKivovWTMNvl6uzXbqpCKcamc/6wC+vCT4/+mCPk3VNUvM8EU/nEUGFxRIeVd1JFE/AE9K29BVQ8muyeClIos2AUBxn3iofF+VIWo61E/sBwfpY0OJTcZ/6CtMameCgBgkgaNWQASLHFWgK9DWKznh1ykKvy/J8lr415ubyKCkzgPRN7GG0+92jTkm4cqOFmT5LBSgWWd9EXFElrGD/h2YS+USA+2DcjH1c X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Mike Rapoport (IBM)" Makes it consistent with other architectures and allows for generic definition of pfn_valid() in asm-generic/memory_model.h with clear override in arch/arm/include/asm/page.h Signed-off-by: Mike Rapoport (IBM) --- arch/arm/include/asm/memory.h | 2 -- arch/arm/include/asm/page.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index d8eef4bd8c71..62e9df024445 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -386,6 +386,4 @@ static inline unsigned long __virt_to_idmap(unsigned long x) #endif -#include - #endif diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index 5fcc8a600e36..74bb5947b387 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h @@ -158,6 +158,7 @@ typedef struct page *pgtable_t; #ifdef CONFIG_HAVE_ARCH_PFN_VALID extern int pfn_valid(unsigned long); +#define pfn_valid pfn_valid #endif #include @@ -167,5 +168,6 @@ extern int pfn_valid(unsigned long); #define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC #include +#include #endif -- 2.35.1