From patchwork Mon Feb 17 19:08:33 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: 13978491 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 317F0C021AB for ; Mon, 17 Feb 2025 19:08:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 151B1280086; Mon, 17 Feb 2025 14:08:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DD07280080; 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 E47A4280086; Mon, 17 Feb 2025 14:08:42 -0500 (EST) 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 A5BA4280085 for ; Mon, 17 Feb 2025 14:08:42 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 264A680A68 for ; Mon, 17 Feb 2025 19:08:42 +0000 (UTC) X-FDA: 83130373284.02.DBA69C2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 6B870140002 for ; Mon, 17 Feb 2025 19:08:40 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=thrH97rg; 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=1739819320; a=rsa-sha256; cv=none; b=C2JRrUy8k6tde5dsu7b8JRtoy8XE+bGEIiC/b81P9+Rqy159HvZrkH2Y7sJziOqVaaLsXs jpgaJgjslPTieCHqC8BESBUx0HfTcMKF9BB1mRYMnbiQdt4Wq5WrBdmCGpePsN5F7J/Dp4 JZPLOATediX6c1I3vOKpppOCa2i9aAQ= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=thrH97rg; 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=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=atMZRm9oTSJ7EdJlQ3h7iJvkLCf12vGPXz2zKSkO6zo=; b=WXFWaSd2r8TuA8VJTaGfPyQ0puZqnfZ0MP3Rv7LVuyk6a/0IWOPUCn+UqbgFEWrAxbhved gwuHsb7cqTLBDhf6nLLnirkh8YAQ7GWWrG4BJl74MmjZwtoa8/ds1TAP2nspwkSY26z5+S wdOT2XrGO2DShW0jCgcufyIJgL6Nbn4= 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=atMZRm9oTSJ7EdJlQ3h7iJvkLCf12vGPXz2zKSkO6zo=; b=thrH97rgQk5cY6SsCjZalRSn93 HEQL4Fk+SimS8m8tDxDCmy2Unz81Dre8AePAFchB1p5SNzijFyHibJ6leOgVkq7ydpyDSd1Hm5diu lFGZZqXQR5j2Tf4MB9wann/BnSax/OOuva/9PjoPPkSnezTUoKZpBEA/tIukuYEAm9AD5qRyIh4lW Y1jjuvk2H/pOVPtbROx5QUrqcuMMBMlVw5lALGiInZjC638qVSFtxWjFoKxtL2gYFsWl3fdFPcDEh IaffNaod96rCTnh7P8Ih+8Zbq/i1e1Ux3LterFamX4KVy9Th0HjUymOZL87+i9HUhimY9zJy/brrk 4dPWDbnw==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tk6Tv-00000001pBc-0Zy7; Mon, 17 Feb 2025 19:08:39 +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 6/7] mm: Make mk_pte() definition unconditional Date: Mon, 17 Feb 2025 19:08:33 +0000 Message-ID: <20250217190836.435039-7-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-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 6B870140002 X-Stat-Signature: wukpjrsubsg6tq4xqf6ne73jcb7t9bqx X-Rspam-User: X-HE-Tag: 1739819320-904207 X-HE-Meta: U2FsdGVkX1/cyuWxBGzrVPLVIsp5reJW2VDVOZi8R59/X7MB009Cua23zK4S7EzYBXezRHkcFj7WwaCsa5r9Hyyj8ZZeEk18qtP0BbdhwCy2XE/hYD9n/Jx1x44Y/Ctp9Pk4DGGDRvPibx9iyONTwI0qIQiLLuKwdC1M3Y/sY6ET01KK021NFT27OkoD7dtVDfoNpn3krc2KouaPSDieNZhRbIf/8Q6vHBuWBjlpWWIMJWsF+6XZcGHO+AAH/PcTSYL5fv7lMqvtShLyxNzKKKyhAO3t63dC9tQ3e1KcofGmEBhkIMWAx9svg0DUUZWyij5hyvH9I4YbnBTqagj/WTP6SKLGf1xvqE4/76Rzl0peb3ncr6nYr7yrNG98RMKfFWyx+NolSGoId8egzIWfQCRAYaY31lQM3L6RrxZWuN9y4hsmJfuF+4TmbJlJ7iSgIEbJIopMSIQYM1xAN4PEC8xVXkczG79JkU6xGnO8sDHiubABLjd6GdDA5/5AiFOFRqRMMSMtQKOwcz6gXBGQt5ziA45KB/rFynmykdwB/NqUE/Djsn3k2QLblqz+Abt8XkgGmf5XnvFRuBEvSeagp3N2EnSThsgv0Nr4VGLWnee84LgWPZbxcAR7D1FL/22nKceJH1EzXkFchba8DuTNkICdbS45UblcQ9e0PoIpAzP2ur2FuqfHyDnq8ZeZA0HxBcvMIamflcyFsaHgaa6AsnmOebHGsg8aqOHv0gD1nzl+duv5B1IFA7PUFOin94WAz4PfH5+q0yFKrREYkOUkeNLumksiOK6Ulu/4vTyPsxAePd/fnKPpRqtkYT1b5xcJYXw8nHOSRCRTdKxwDjVVJBDRZsNkY8RXVYj+BxXwZTuZZgLcLvU16LkHnTiWu7gWNrBLRiVdz7ZwNrdh+139Fnv+5aO5QdRmES2yhgwWLXh5FKiasyJnMW1S/lwzj8nfJZoNSTmG48Htp7VyheF Q12yH7pH VFmOb9deUXPb0InLh9n8bgrlbaUM+O2LZnHUvrurtfTQAlmZD/2gK7pkQifsP9ctVxnjYTl7sYB+idJe2WTymL5fuuJNqCb6qkIC5y+/8FHjMe3O+OuPqKn4wr0mn5QAsbP3QoLVPbzoqOVGDzu6KRVmnb0sNfcyqIycwhAnKQ3Q5QnJenXz/BcbClpxJ+bcWReAYPpS7baJgCm93A/2w7Cq47HVizpAsg92bpijvp9gO7msms5jpkixI0Pbk7Z02XR1P8NmeaVwKXvfpU51Of5Zh5f2vZIPD93PN 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: All architectures now use the common mk_pte() definition, so we can remove the condition. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: David Hildenbrand --- include/linux/mm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 3ef11ff3922f..62dccde9c561 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1916,14 +1916,12 @@ static inline struct folio *pfn_folio(unsigned long pfn) return page_folio(pfn_to_page(pfn)); } -#ifndef mk_pte #ifdef CONFIG_MMU static inline pte_t mk_pte(struct page *page, pgprot_t pgprot) { return pfn_pte(page_to_pfn(page), pgprot); } #endif -#endif /** * folio_maybe_dma_pinned - Report if a folio may be pinned for DMA.