From patchwork Sun Jan 29 12:42:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 49968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1729235wrn; Sun, 29 Jan 2023 04:44:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXsULqgVvILNB10sj4pnpRH2uKnleR0EABMm1gcfEFnASuzTlBGG3J3/YDqO6ZAFh1vEQyTI X-Received: by 2002:a17:90b:50e:b0:229:4dcd:ff61 with SMTP id r14-20020a17090b050e00b002294dcdff61mr49189711pjz.28.1674996270448; Sun, 29 Jan 2023 04:44:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674996270; cv=none; d=google.com; s=arc-20160816; b=WP7jyyUK2oXI2BAGvx1XuRllE+CQpOVg9WFhsDmD2UH5XYWBS/kR8m4j+HHCYK3A07 i8dgmc73IqRjkA5jTsyGV215oOMZi+g4q4IwLlvKYs3R+KMVCtYS7OOOmX3EG4wtI6ve HPB+Epf5TlfWnT8SEGzkgIsd3mWUQZZUCjR5PT631s903FdhyC9D8K5OOsMOH0lDEw52 CuSPRV81RNDJrP8IL1uUrYy6HzRUBrHbiAcIrpo6O/Aii/1cSMrVW30VFKlES0J2sdjP NrYJ8rM/ZDr1QAM7zfFW7K7vf658S+QPt2L8ZfeTzT/Qrk9khq8pffjTxrV3O8pF74W4 9LPA== 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=hn4uqFnw1MpNZhoSRz5qWAvlShkpLY3aict1kuPnWDk=; b=YwfdKLnn3Fok+8vlAItx9RxeChJAJa89Ewv4xkdbdAYRF4Chhf/YUP/xq+CRN9zRdT jVsicLDdDgwz30wgGS5WgLsjLoepH0WJPJG8fq/eEL0TV4Zb9GYDNs5MK9XKKUv8qyZ1 43xFBWJy8QsxJphzYJWAyS1IrL64Lpb1H972+kDd/7XttCv0fjenqS46asItHqWZYL2w oOZL3njEx4uUpS+Y5u56rp/y7sRQ9rlm7Y4kKkBQ0+R9Cpz+H21SOYbci7p3d6HaagQD KB8y3Xgz2OArZSv6ABEg2F2uz1WX00dq3m5l2yHEwDQWdqTUWIU1lGnxdZFUFFug6x96 GdIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UOlDKwso; 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 i18-20020a17090aee9200b0022bb81526a9si10835699pjz.8.2023.01.29.04.44.12; Sun, 29 Jan 2023 04:44:30 -0800 (PST) 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=UOlDKwso; 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 S235004AbjA2MnS (ORCPT + 99 others); Sun, 29 Jan 2023 07:43:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234954AbjA2MnM (ORCPT ); Sun, 29 Jan 2023 07:43:12 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFEAB125A7; Sun, 29 Jan 2023 04:43:10 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 980EAB80C2C; Sun, 29 Jan 2023 12:43:09 +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 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 autolearn=unavailable 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?1756360889126529446?= X-GMAIL-MSGID: =?utf-8?q?1756360889126529446?= 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) Reviewed-by: David Hildenbrand --- 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