From patchwork Wed Aug 2 15:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13338359 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 032A2C001DF for ; Wed, 2 Aug 2023 15:15:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 210092801A2; Wed, 2 Aug 2023 11:14:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F34352801A6; Wed, 2 Aug 2023 11:14:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5D2C2801A3; Wed, 2 Aug 2023 11:14:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B1F532801A2 for ; Wed, 2 Aug 2023 11:14:21 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8500E1409F6 for ; Wed, 2 Aug 2023 15:14:21 +0000 (UTC) X-FDA: 81079510722.25.79EC9CE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id A276C140017 for ; Wed, 2 Aug 2023 15:14:19 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cQkkaX9A; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690989259; 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=GMRZGVpnCMpBl9S2OQBEWBTvbiAjuCy5RfO1vOJbT6c=; b=51ROHPU29A0+l4tRSQgiLu8cyKzgVjv8Np9QV2b3jNMhndycW6SRTzSHqPskJj19eab1CC 5dg6KyFlPGtttbkE1PgoKUiB6aQ6CXZhI0qMNqZEu0zgsDl/2xMrXk1LzJ6WtfF65vO/KV s2zX+v1BUagtGkSxi1SfS4ZhIWZ1rUo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cQkkaX9A; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690989259; a=rsa-sha256; cv=none; b=PHhFYnDhAJgjtsXV6R0Q548/kiq0Hl+h16rqt8JHz60XX96HdK77Dy9uUe/Rl35Yv3elTs 36bm5oOOuqxgM9w4vbrp2R/BPiMxEz6kUlDm+ox53rK38/0Ot3LGUIUb3iKsTopD79pZNo qZZpQ9xc/Siq9Ky0k0utOpDAfxpAFPY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=GMRZGVpnCMpBl9S2OQBEWBTvbiAjuCy5RfO1vOJbT6c=; b=cQkkaX9AAfT+d7aTl5ZlUwKXon wtvoBRn9/aedjqXlIbvq18fj1I3TJw2+Zzf0Vr5WnotPRXSumcCXfibnTrESIbosE2vYswfRzJAVa 5H4yBKdcE98OVD6ZAzq2xzrvctgLTLNioAjG9q+h6IlZXBn2pr/rjY0+/1fkGPnTJNGjWwQwqp54d t4ypSDkHUZ53K1hqvfNIg17njSek0Kx0yJSgRxqmqJklyEUyXTmY4IFbNUXNPvbSrwInEp8yEwBZR c0y0PWV2FZa7GOSlSo0lATyq7uLmb+tmAxstsweGFfCCSbkM5AFqWZR7TQaEEkgi0+dczcR/0Sv1c 3m1xnWGA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qRDYB-00FflP-LZ; Wed, 02 Aug 2023 15:14:11 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Anshuman Khandual Subject: [PATCH v6 32/38] mm: Tidy up set_ptes definition Date: Wed, 2 Aug 2023 16:14:00 +0100 Message-Id: <20230802151406.3735276-33-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230802151406.3735276-1-willy@infradead.org> References: <20230802151406.3735276-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: A276C140017 X-Stat-Signature: n8j9yzrwq4aerc8y5ihpinixext8t1mg X-HE-Tag: 1690989259-742716 X-HE-Meta: U2FsdGVkX1/V4k6dUWs54q5lTXI+/DY/XIpX0cGJmSOepCBhZpNzQyiiOzE00YAG32p2QA7ka1JZkNaLEsAwzowG9GR8nfBow9zzmABzSH+BLGyVUptok90SNMYB3samwcM+D+Pnl+mv0W/nDz4Y8J/s21PMs4QwPsN8XXpywSgLOyIdsHVcRg/79d1bT7TthomIxw27kuJCOrDZ7ja77ul1qvx4G/ZSEYbI22IAlixU08EVkANvsPr6Wd585VvcsZM/zi6PNGJmihz7877sLvgxrH86rqkVpPaW+yTSLRMV4fDFRavYS5aRx5O4ErBaPGXOtCKqcQQCEQTjJgVwKycy9aWo4bNjgoX3w+JbPqkFfQap7BMrcA6TjkRFZVYR7pP2jeww4oJTbXdzuG0zRynf3q4RoGwDNsOB5hX6mJC48hbdYfE8NLsgFMKAqghe+NWinyYWppYRsfl1ax+EDni6SHk//sPLJEoiYfKZ/ee0ajiEcbosa/opEIXAFa4YK5IwfJKnSD6pz+b/cRjoAeJZa7Rgpvs0xu24Hx/79Ax2q759ZUlgvFdK+8Vw1VDu6hTrFQj5gn17IS4K1jxhf1wuIh4IqCn9lLYN22WLgRjMv03FeehuxdFo6bKFZLhSsfLIVaq8mBv6qC5PsnssW9qy28Z+OORqXpND+MbjVAzwJTBLQ/tFqFEe04PIBEBqRDfpV9AD0uDntzYzmwrEEdSnLOtss9oVik3UOVQ3GsrRofzVBCDsxVrNhdhCtQ4a717xgwsNxCmWoSdd3MXiQ31pbzcHVtbm6ndJUhTYdMga41Al0s/uheYa/iitIboJ/mgWR3w5G0ByE04tneXGzN+rpzRfgn62y9AZuRLyn0hUHrpQr2GVfMYZgalb6TxV3ATad+Bz5ivARgHbvv0fYRzLtxPhDR2kHPMbBEsQrOr8cfQMsmdr6KjVuTR1h9P1rmldefKpn0fcC7uubGL B/YB7DwJ VBNGLFMN/XT2nGCQVyEbTFQ1pq+oLvg+/jqPgbcbzzx/hOTVjc+6l8lPbgD/HTYr2ymxJNfNqkrCa1iQG4LktBDvRAbGIT7kIuITntMJax0eaXKKVWoqqNAhfqoZVpfgdDfnBWYY46iSJZK8moaGriAkRMSdxAAtR4oHSvt9zI3juuvtmdaX6z80jWrjJfA1vm+yHAeVIeC8QLYIouP5iBNCqdjoWJvTRmCKV1HDBE4HEW5TZKbPOqK+BMJFHAi4vK1DjkCWYN/0ySu3rAA0hK4OpqBTGvj/kEvPD 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: Now that all architectures are converted, we can remove the PFN_PTE_SHIFT ifdef and we can define set_pte_at() unconditionally. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Anshuman Khandual --- include/linux/pgtable.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 3fde0d5d1c29..9df42e4721fc 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -204,7 +204,6 @@ static inline int pmd_young(pmd_t pmd) #endif #ifndef set_ptes -#ifdef PFN_PTE_SHIFT /** * set_ptes - Map consecutive pages to a contiguous range of addresses. * @mm: Address space to map the pages into. @@ -234,13 +233,8 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr, } arch_leave_lazy_mmu_mode(); } -#ifndef set_pte_at -#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) -#endif #endif -#else #define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) -#endif #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS extern int ptep_set_access_flags(struct vm_area_struct *vma,