From patchwork Thu Feb 15 10:31:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13557856 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 7C2C8C4829E for ; Thu, 15 Feb 2024 10:32:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E0738D001B; Thu, 15 Feb 2024 05:32:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 091518D0001; Thu, 15 Feb 2024 05:32:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9B308D001B; Thu, 15 Feb 2024 05:32:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DF5618D0001 for ; Thu, 15 Feb 2024 05:32:42 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AD8BE80FB1 for ; Thu, 15 Feb 2024 10:32:42 +0000 (UTC) X-FDA: 81793674564.02.087F6BB Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 1F5201C0022 for ; Thu, 15 Feb 2024 10:32:40 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707993161; 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; bh=L5R0Hb3vr2XhKlRaGDOJDdSoNMHQdu7Je9L2b+7crXk=; b=YrZ2YqJnzFolYgeuUwAq9Gm25/cgZ9q1KYCxFitjffmzrBOzTdJ5fJxyitPE9T6RlmZHxj rTRcgyOtYP8VhfUOKxGSMDJK2tcmN5DmJDYWKKDsAYX+5Kj+XYOHKBFDvvq7qtFeGABpk6 CYnhDmY6ZFfQBujSJZUDYuiOdihwLdk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707993161; a=rsa-sha256; cv=none; b=pYjf8x5OCLLFXI9YmgfCjS1xdYctauCCUojY78n/mrr84jKgbMdgV/kKOyj+Uloths2IxZ mXSmiZeigEccPNWK4K2+bKHJf1tsYapV+qObHwIcWLYrwodJ5h8l7pitsxGpKOrz0Z/8Go SPtD36B3ZUGf+QS0PrtYvpQx6FjvRGE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4DA741516; Thu, 15 Feb 2024 02:33:21 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 442213F7B4; Thu, 15 Feb 2024 02:32:37 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , Mark Rutland , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 06/18] mm: Tidy up pte_next_pfn() definition Date: Thu, 15 Feb 2024 10:31:53 +0000 Message-Id: <20240215103205.2607016-7-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240215103205.2607016-1-ryan.roberts@arm.com> References: <20240215103205.2607016-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1F5201C0022 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: chzpnw9mknixfsybdxnzba9tibosoiuc X-HE-Tag: 1707993160-743886 X-HE-Meta: U2FsdGVkX18DTekH2zeg73dR9RgEgmYE8EHPbv2I2m1Y6Vp7e+Hz0B8xE9THR8L0zly2ys+D6mMbWN5FNlEr/MiHdB58iS3u+WP2hbba6anIuyjKmvFfwTZuGXJoANrUYJhw00RO+Y1DU5TDXGAUqfIDYmSu8CifmxjjkETRxv9hb81t3ln+VpbzCpKZ7aERsvhUZRhvj0UOP9ngCuSrqEJ2aguQCPyURdUcuIEcWjYE3il4yN/0xCX+dFgCQ1WaW12xwUyU2+8nzXeRJ/49uQEsRnym9I82+SUU8zMQgH2MhEY5SgepOIGm3h0gBVkMYIDI1ZqoDsQZzxhl2VJ5Nj7KOVUInaEw/i52OO+t7RcDO60RdFt3Z3+UUj5x4ku1itJlN0f+SXHVoX/ho/GQHkJXYDAaIUXYMw08w5oXSwiJ1aYFAe9a7fweW7LUD7S+wdRaD/VP4PgKxzbTW5saI7wKjwtssX2OfxcuyzNAyjCC6CcDGrQcrhuYCtrXpVQASDvrKycjDxWHWQNNysHN+poKb7CbZf+rBCt4HcXDxqURQZ9UlprkuJtfsnOouflXqla3Ag5N4ZKLLQRkT+xqfWY/QqoUfSvq5uEvYNCeNi8Ago6Sy8WLALUFIeHlgzi82kPPDa6sp70wLy1rBEUBEtqmeBerZmYJCtCdk489LVmvMt8pgsMeI89FIwNYc5VI/76VGC21r91AIslf/Gw6agbiTOZcxTZ6SWfsUqDs0HQ6LWiTtISbOt9avO8xhy6AZdw6mrmNIC1mJODjgc8faMi1saGTDVThq5RbTfzhfEVp4eJcMvlu8y3weyvzF7F1zM+XHmiaaKbjSaqZTO96ziCSdKbopbrMqPk/NSsstAo46538Qink1Z1BI1FcgQPTaIjtIk0H8v011sLiM3mXMBBhXdTD0zSvQ2pYodVzzCTpHsKjpN5ipwyiR2kL4M7PFWd/0obfqg0305qXUNK MSvKyzY/ NY9kuTJuePfC/FRqeN7pPzpUA1/0FcR1egFIiDHeCTO2+hknTDbGuWCO1fXL0h0M+v1PoZBpg1bTSUUYM5jU4y7e7TSUuq8OoFU9DApaA1LNQHseOZ68gLOKHFcppqLGm4xZ4G1pxjD4cwMNKTR99jni91+MqBCqGUq9G9oPITjh20hhDvHwkxBxcZuAFM7r0OWIsxqYzw1IpQ21Moa2jsqcDjubVThin9AmRU2mJsbvsM/ctkUJb1afM7C1VGDfYmo/mmaKi2oLUJbWkoV37rHhV5g== 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: List-Subscribe: List-Unsubscribe: Now that the all architecture overrides of pte_next_pfn() have been replaced with pte_advance_pfn(), we can simplify the definition of the generic pte_next_pfn() macro so that it is unconditionally defined. Signed-off-by: Ryan Roberts Acked-by: David Hildenbrand --- include/linux/pgtable.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index b7ac8358f2aa..bc005d84f764 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -212,7 +212,6 @@ static inline int pmd_dirty(pmd_t pmd) #define arch_flush_lazy_mmu_mode() do {} while (0) #endif -#ifndef pte_next_pfn #ifndef pte_advance_pfn static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr) { @@ -221,7 +220,6 @@ static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr) #endif #define pte_next_pfn(pte) pte_advance_pfn(pte, 1) -#endif #ifndef set_ptes /**