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 601C9C61DA4 for ; Wed, 15 Mar 2023 05:15:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99BA98E0013; Wed, 15 Mar 2023 01:14:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 887B28E000C; Wed, 15 Mar 2023 01:14:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64B2D8E0016; Wed, 15 Mar 2023 01:14:58 -0400 (EDT) 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 35F7F8E0013 for ; Wed, 15 Mar 2023 01:14:58 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1622A121062 for ; Wed, 15 Mar 2023 05:14:58 +0000 (UTC) X-FDA: 80569968276.22.49126F9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id 60EA5140003 for ; Wed, 15 Mar 2023 05:14:56 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KO1zVLlG; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678857296; 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=BuY0++zuEEGNdRYvMzcc0MIGd74y5or4vnxSMjxSxAU=; b=QXqif9a68EmtJ7hjGwg5jSiRGal+8Z2yxSIfEGu1xvfbmlWFWib2ECYAjozNA2i5WfPfxD /nDtwq8bp2+cE5/QVzAXtr7g+1tYWrq2g3qc7OlBO508IwIcv1qVnnQLhdG4/qwNRZd2/N Tff7BAcwIeSDSgl+KEuiP9kBRDexFfk= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KO1zVLlG; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678857296; a=rsa-sha256; cv=none; b=a0mxFlTwfP4kA+EbmdQO47r6qCqQr5hbXcI6fs36bxwIkURkZNs0hpiWRE0Ci4VVLFcLuh J5xCPNSJdB3UDJWpYqZ26iKRfvrG3bs9tdxzdtPzLB1MGSirzSYJS5Y3EFwFE9NoNY2Sb0 ixAn28ihowsgHMpTtaDOKh3g/wbCz18= 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=BuY0++zuEEGNdRYvMzcc0MIGd74y5or4vnxSMjxSxAU=; b=KO1zVLlGb/MzuwQDc6H5JGyaiM Rcd8vcHf9egA+FO/fneFm2txL7VYi7RGvKiYak65nKIhpMQYh5LYZ23GREoZnDyWUhfJJlzR6cz5E z8KN/MPG9T2jlYkxKrF4K33ud3w2oV4+pqBCVlhSddpm1HAiF2CpmpsGIOdC/zLyrNYNIlfh0c3aZ d8oO9am1dBH9CzW4W+jf64/ZJe6NYzB9er70DxS58dqSMTGNPqh16kMVXBx4aPUrzrc9zzT2eJ3eF zPkCTWdMjtaMHnvzt85vbQXvo/OnTpecryfD+3uwDbqVIpn8hor2cZSjxd3xuyKg5td/+gj7MpPeF RY1ek+SQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTO-00DYDX-87; Wed, 15 Mar 2023 05:14:50 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 31/36] mm: Tidy up set_ptes definition Date: Wed, 15 Mar 2023 05:14:39 +0000 Message-Id: <20230315051444.3229621-32-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: twrzxdcru4muaemu8ttpkxdc53qode9i X-Rspam-User: X-Rspamd-Queue-Id: 60EA5140003 X-Rspamd-Server: rspam06 X-HE-Tag: 1678857296-842695 X-HE-Meta: U2FsdGVkX1/Ud9X+bvTTMa/mi1XXxgJhVti9C31JWYpSnENuxVa9TNBY72wf3y1RlI2VTOHWKvNRwzdHO8OJtry0OAeCjtfcbWiPYR0KFrry+RvM5uJlwPjWf4npNsk7is2KIZ5SzJK6hoLVYE2g60mivfOGCFbxJnENgWMlCC9ewOY4loGLQcIX+hXdSZP+IjNziuahWWscYfP7Q+Q95jUJi3MG86QoNBWl2yUGwPSxgj/iQ3UyF0rf/BnrqjsyWKwyFfcAJyH/5/l/6dlVFxiEJHThM56jtKQd8ALCdrlFlowcS+Bb0kNR9VKwj8a1dj8ZCKnhlXytE6bROjmqQrOvw5aiwCcmbsweVFBpNIwQxXJgYFmprwfxjHnORcCYx69l46uBiqkRSFCGbJQxqc9FV4wfAZW5IEOlH8QvWyJFiJzRW/AT2zd2/9/+lQhZM89g6M6OCDRWCwwI/dVCNAYu8h3nt3VaSSl7pAFJeaZzcDbDFFlfhhqObEzm0/xIbV9qjqvgDTf26XApYrRiw9+VTpuiX/2yQvyLcZbh2PWp35dWGADmtVFqV/y9efI/b3n2ldfxG6G2WQKMVPZ39+L9uuXLprLhl47gtlRnnQIoVs2Z/qAgrJEsQpmAzyVa9OwR2V5clvGi0eA97g5oGDaaBOTwiFO85hKtrK+ZoDHH0ynfXvAtB2ihaCDpfjmc22cjiLg+9YO9C28J2OHeAVoXTv5z9Sa+KkWr5lP79mp7aGf6CokUGP/7qkR16qC3Q+anG0yDfeNixSARZoNZ/5iOofrlr62mLU8HteEg6av9pfWAnjO9f+6vh+OMjUczuyrkmEIFxjf/dmCQGWV1y6Tc+c2cMvHeJENeNiqe28KqojmCn6VEvpn/ZQ6HY7nLT3XzPNfReTq8iv4+sSlHhVDQ6HCfeSNGyyNGNmqIjUgFijAo6elijZByoGC2NpZjTJo6YVKjoH273HyU1+4 fbNJ0jIc pSFeTUbYkfwhnPJuHqwkiaXb56WRANiLADucRe3e3UZpbkwnz3La/MqXiLolENcHMYO5XwMQjzKe13Zuz9X4TxsWj9sfnXZHGCtgOeQcdIOAZeAV02qlZNogWVFu0p7+VQGs46B9Fasg6dcEBLHVR1s1cOtlustRDp53eAXQF+g5/NCJo7XtDAAXrZItsFaTIX4h1VPCa4cLkhWHgdXBf6pc9c5/cMq+zYk1GCqLm9vKSa7hC2p2uZpfPzA== 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) --- include/linux/pgtable.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index a755fe94b4b4..a54b9197f2f2 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -173,7 +173,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. @@ -201,13 +200,8 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr, pte = __pte(pte_val(pte) + (1UL << PFN_PTE_SHIFT)); } } -#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, -- 2.39.2