From patchwork Mon Feb 17 19:08:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13978493 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 0B608C021A9 for ; Mon, 17 Feb 2025 19:08:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B2D5280087; Mon, 17 Feb 2025 14:08:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 54BBB280085; Mon, 17 Feb 2025 14:08:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03FCC280087; Mon, 17 Feb 2025 14:08:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A466A280080 for ; Mon, 17 Feb 2025 14:08:42 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 307A3A04D7 for ; Mon, 17 Feb 2025 19:08:42 +0000 (UTC) X-FDA: 83130373284.05.3DA92FD Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 63D1D80014 for ; Mon, 17 Feb 2025 19:08:40 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="QnkS/IDl"; spf=none (imf02.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=1739819320; 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=j0C36cwE02tcp83xir3MVAFQIG4vvurnU5t2AtfKn0w=; b=8Nm/1LEY8zA2olHLJ2iKrMP3oLSkmLZNBGgWDwfwtpl6G+EEhQd/58RCcQdTCGyiHVFl0Q dkMoutF5x52L0BnRPFy7WxDwH8zD+XvbCtle3lkie1ymyDWasKwFKKffnOAez62YnaalJg X8R2zqhpz8BKZeUkn4CjpzMPV63KR1E= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="QnkS/IDl"; spf=none (imf02.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=1739819320; a=rsa-sha256; cv=none; b=Zib9UmkYIMNFldMUdeaWz4Dh8HG8K0Eo6y7dg7IwdNQ7I14eRhJCoKliKoDJnvq7sHasXV p5Pc3EVN6O1qVUKXz3cMhFw30RUY751VzeAVi4yGArpFqKI8a9IP2W6/z6C05nLBdR/Sbi jmiD/ZtTo/Py3MGpMIFsTQyvlVfrTTA= 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=j0C36cwE02tcp83xir3MVAFQIG4vvurnU5t2AtfKn0w=; b=QnkS/IDlpFNbxP+1NPSLKrdsh0 W3YPFFdUYdE5bv+IkKv1DttNFhjdfeK3JoNCcH2tDcwHkIiWvg/C2a4wH/u3IHTb4YM/lxTlMkakQ MgeRGI7FcqDMPeId+YYyjBB4W86R7pZIdHQq7dYEXsK1M2u2KGFAQTokc2mFFTRlaoenqS0bKIjqZ aJ6NzWzfDrjw12g+GkzYADGVkGEOfzkaxmBopCBOeVfBtOQq/NWVXjDBWokSfk0bSXo2D78KbAe3A Xdwcq0TaABahPOiqCpI7JbV5wN8PwHPqxR0WfXpLKmBzkFD+B3iU+27xyl7mm17JJpUaSP1DZgs8B tKN5k9xw==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tk6Tu-00000001pBH-3P3E; Mon, 17 Feb 2025 19:08:38 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org, x86@kernel.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org Subject: [PATCH 3/7] sparc32: Remove custom definition of mk_pte() Date: Mon, 17 Feb 2025 19:08:30 +0000 Message-ID: <20250217190836.435039-4-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250217190836.435039-1-willy@infradead.org> References: <20250217190836.435039-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 63D1D80014 X-Stat-Signature: 6461y881b7ehkskgrojxaafj4786dhh6 X-Rspamd-Server: rspam03 X-HE-Tag: 1739819320-777926 X-HE-Meta: U2FsdGVkX1/VV62Q9zB7BjRiVBpEQR0VV20G1iuZMOqVENrd4u1LgRMf6haGAZJl1Raukts5Qkd/gCvY8o+Fv77OWqsPdiQZgIGxfGrHefofrW6TKU1XWfbhX0BkbtxVbE7Gd/0BhMzax9TxJalBRx5hezTLealTr1eo2BKbJIuEmij9I0HfyQI62N+S8XmTzyebRIbhOBU2tajYRhhFV9W4JIYQs6xcZ7LyayABCQebGDzVI9e861DS6crg3rznQ3g9pekEhHeYEWlFkwxqR2LaeBGddMqsQkVGd99Q1CEhgn0CQPspwL2qLFvPIFu8RpRQQ20Y0awu36Uzz/lo2diJQuWIrDNCZoUz0hPDwWzOtV37SH1cXe6YBBBTA1qnCwPZf0gHoYwug/hCsPIjU6Zc38HlfOt05ErCfSCN6e5/3xo67wkP+GYOSL/2rG5DCNML459X09ujmB8h8pUM/CrP7pV9uOsl9zaUHP5g75q0UOHZZohAEGIR0r+8NWTR+rJ1tYS9jRgzx6q0241NeL3J3PEcwNnSUQunqsniMb1D/4YKqx123RCI5sblKAJ613loI+APZDjI8lpoM5yOFe9qxygnK1+Yf5PZkt0K98eWzZV4BjTSddh5VNK/qzvGae+V7CXn+UatHmCk1a52qKGb5+OL5e2GiGRzN/GkPPINCOdBEmGAhV4r+4j1qkAjYv2cvpp/r9dqco49RBdrQQ09bmx7GXUtr8Kk+wlOzBT7XFjkNWJAJIsTrcUv5snuFTzGd9e0RJB/G2nCjt6Li1HsmK64vORFmu6DhdlPC/1Zs3MVf+2E3OulJgIj+euiijOmCdGtBpYdjlsFIQzPYEEcehFh+AERuyK4YfrKhQpoZ0XK+U3aNQOJBGFmIvfnX0+oT7tJ+egXMavQDBeSxNsJwo0vlU+F4hIRarozeswERAAP8pVjZibkhizt/VPfotrFWMo9EVhsxKjOoyq jNkCb0za MTN6fYoph4pDv7R+1sjczq5GE3u/LSC3azEXx5nV8hNXvs5J83fvQmkxe3eLdh0F0H6laqpzTFshnNmGWEO0Ht71dt4BLoczqetFIgnN4Z5choQS3qgQoWOY15TiI48JeA/CJ4zdidyYRb+KMbVVh2TEnIk30GDVHVVzZHpEz3gMOkBoc256b5+e6tptgu9qxqxaxTocU841X21/bg8oGamo76jzDh33fNwpNlxNoqHoT2uJ0FYQSZQwRnVwseTnw8lqrZLfDL0xjaOtlTd2gfCpY4RgcBDjTcuyC 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: Instead of defining pfn_pte() in terms of mk_pte(), make pfn_pte() the base implementation. That lets us use the generic definition of mk_pte(). Signed-off-by: Matthew Wilcox (Oracle) --- arch/sparc/include/asm/pgtable_32.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 62bcafe38b1f..1454ebe91539 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -255,7 +255,11 @@ static inline pte_t pte_mkyoung(pte_t pte) } #define PFN_PTE_SHIFT (PAGE_SHIFT - 4) -#define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot) + +static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) +{ + return __pte((pfn << PFN_PTE_SHIFT) | pgprot_val(pgprot)); +} static inline unsigned long pte_pfn(pte_t pte) { @@ -272,15 +276,6 @@ static inline unsigned long pte_pfn(pte_t pte) #define pte_page(pte) pfn_to_page(pte_pfn(pte)) -/* - * Conversion functions: convert a page and protection to a page entry, - * and a page entry and page directory to the page they refer to. - */ -static inline pte_t mk_pte(struct page *page, pgprot_t pgprot) -{ - return __pte((page_to_pfn(page) << (PAGE_SHIFT-4)) | pgprot_val(pgprot)); -} - static inline pte_t mk_pte_phys(unsigned long page, pgprot_t pgprot) { return __pte(((page) >> 4) | pgprot_val(pgprot));