Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195547/?format=api
{ "id": 2195547, "url": "http://patchwork.ozlabs.org/api/patches/2195547/?format=api", "web_url": "http://patchwork.ozlabs.org/project/sparclinux/patch/20260211103141.3215197-3-rppt@kernel.org/", "project": { "id": 10, "url": "http://patchwork.ozlabs.org/api/projects/10/?format=api", "name": "Linux SPARC Development ", "link_name": "sparclinux", "list_id": "sparclinux.vger.kernel.org", "list_email": "sparclinux@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260211103141.3215197-3-rppt@kernel.org>", "list_archive_url": null, "date": "2026-02-11T10:31:39", "name": "[v3,2/4] mm: rename my_zero_pfn() to zero_pfn()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b1d324f1798fa657b174c1a53bb6e9c2dca5166e", "submitter": { "id": 77733, "url": "http://patchwork.ozlabs.org/api/people/77733/?format=api", "name": "Mike Rapoport", "email": "rppt@kernel.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/sparclinux/patch/20260211103141.3215197-3-rppt@kernel.org/mbox/", "series": [ { "id": 491817, "url": "http://patchwork.ozlabs.org/api/series/491817/?format=api", "web_url": "http://patchwork.ozlabs.org/project/sparclinux/list/?series=491817", "date": "2026-02-11T10:31:37", "name": "arch, mm: consolidate empty_zero_page", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/491817/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195547/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195547/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <SRS0=yTg8=AP=vger.kernel.org=sparclinux+bounces-6260-patchwork-incoming=ozlabs.org@ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "sparclinux@vger.kernel.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "patchwork-incoming@ozlabs.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=FGmYLPza;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org\n (client-ip=2404:9400:2221:ea00::3; helo=mail.ozlabs.org;\n envelope-from=srs0=ytg8=ap=vger.kernel.org=sparclinux+bounces-6260-patchwork-incoming=ozlabs.org@ozlabs.org;\n receiver=patchwork.ozlabs.org)", "gandalf.ozlabs.org;\n arc=pass smtp.remote-ip=172.234.253.10 arc.chain=subspace.kernel.org", "gandalf.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org", "gandalf.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=FGmYLPza;\n\tdkim-atps=neutral", "gandalf.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=sparclinux+bounces-6260-patchwork-incoming=ozlabs.org@vger.kernel.org;\n receiver=ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=\"FGmYLPza\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201" ], "Received": [ "from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f9vwn6865z1xtV\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 11 Feb 2026 21:36:09 +1100 (AEDT)", "from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])\n\tby gandalf.ozlabs.org (Postfix) with ESMTP id 4f9vwn5drmz4w0p\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 11 Feb 2026 21:36:09 +1100 (AEDT)", "by gandalf.ozlabs.org (Postfix)\n\tid 4f9vwn5ZC4z4wB9; Wed, 11 Feb 2026 21:36:09 +1100 (AEDT)", "from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby gandalf.ozlabs.org (Postfix) with ESMTPS id 4f9vwk2nw2z4w0p\n\tfor <patchwork-incoming@ozlabs.org>; Wed, 11 Feb 2026 21:36:06 +1100 (AEDT)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id B5FEB307AA48\n\tfor <patchwork-incoming@ozlabs.org>; Wed, 11 Feb 2026 10:32:27 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id EA695367F3B;\n\tWed, 11 Feb 2026 10:32:26 +0000 (UTC)", "from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org\n [10.30.226.201])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id C3F7B331A5C;\n\tWed, 11 Feb 2026 10:32:26 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPSA id D0801C19421;\n\tWed, 11 Feb 2026 10:32:14 +0000 (UTC)" ], "ARC-Seal": [ "i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1770806169; cv=pass;\n\tb=mpWuRbOI4ElNL8ytujhe6NVT9TMA6GTt3aXcEjysDgefuB+OapeI0P/Pjsb6vlqLMoqEUJn+yfpUCXQj48iaiU+hTrvx1DjRVgQX0IvoNeD49kVbvnEJmz9KISR8+FiIxSGDJF3nH8WvUKer4CG4pK4Hx4jOHHW7ftMq1bs1bNRFH56AGmcYb95Cwn2JuGLspj0LglC827GAMgZlz63OBNVcJvFdra3MPPi1SCa/cy3wfg1o2+5BG97GUHIg1UfvwYCEL+0HcKOQ7i13l8U58Df1lbpv9e/KaP1SMAYgvPQ07YkPxb1bt5HPcpeqP4vHqk3juar5xviQ/aEqYbYWdg==", "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1770805946; cv=none;\n b=nWRCaTZEuEfO2jP5fRfh72CIe558SR0F9UR05bR+EeuvgSzErgMmTwb8LN7/Wb6khlieI0ddesEudHFOb/UlKOQZheC4byeUg0vZLTJeryxmNo9SPL8ZEDJTXiY9Zi9szKCEj2pBSMjWeWGESyOZvMabWFSIOyXlYfIqfGtejRE=" ], "ARC-Message-Signature": [ "i=2; a=rsa-sha256; d=ozlabs.org; s=201707;\n\tt=1770806169; c=relaxed/relaxed;\n\tbh=l/aoERoFOXeyXFOhhLJsMp5W5sgybP/LbxdaeC99ppY=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=Mr9yypuRuwuX5fn/aCuYoTEvdquTtS9MZ3Q3dDtB4QWQ48SX3+RrlXM5rszFYZ7Y0KU3/mtDABy3YZuuaRgMcqugGJMaIMRvAB/tQ/6zfRI0ypcSm/8DSznZ6bkocZtUSFN5xrI9k90ZOHPwMPe+0Qu9RlTl1Xervr8MBsMzKl8IDuyprNai2VKJ+8dcXDauGBlbBL+kmk3PeHi9YjpwqkKCzdmF5DCGEN153t7uWoJN2W5ZMoY4lrtRwvRGvGvcZXTVarEh3hjtk/0+JlGRtd5q4k2X5NSJY44Ixp2RFX9szKMd99bVblo6fNI6CFomuEWccfvs9nohjcogulGDbw==", "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1770805946; c=relaxed/simple;\n\tbh=vA/knfi9Vhxszewnk92IVn+RVqoIT2RuM5wYLPxphtc=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=gnxks++dS02D5t5b+sMzEsu5/gd2HIy/4g/DTGu1xlH2qOOq1dkCUp1bexitKsCPFW8gFks8UY0dKqFjTS4LNa5+val9MVwBfR0qVfpRcCpfzOhAxKbp2nJjATbFkwKTFS0lflAM9oe8Lx6O5ehlkspJUasvA+DsY4bCL/QZ0v4=" ], "ARC-Authentication-Results": [ "i=2; gandalf.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org;\n dkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=FGmYLPza; dkim-atps=neutral;\n spf=pass (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=sparclinux+bounces-6260-patchwork-incoming=ozlabs.org@vger.kernel.org;\n receiver=ozlabs.org) smtp.mailfrom=vger.kernel.org", "i=1; smtp.subspace.kernel.org;\n dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=FGmYLPza; arc=none smtp.client-ip=10.30.226.201" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1770805946;\n\tbh=vA/knfi9Vhxszewnk92IVn+RVqoIT2RuM5wYLPxphtc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=FGmYLPzap419hKTlPDkD/m287e04gxg4KUE3Smz/Q3EHWjE3x0qsYIQPSqIQvKK6A\n\t L3MC18Ziq6Lsh6Ep0ugSBryw7Z8iReRdnJuR0GI/TrybYKkD/vPJ7zvRCN2CH1KKoR\n\t S9x9odwqLsqrL8gVaOfxIEGjSc9aFj4LGTZu2tmElRXBv6iR/XK/YW9Ep/4P+dSSuX\n\t 8vXc/Yd/qmfdhwXBWbK50HNKVw8/2k1p50eKv08cfKIgYMyFkPTwsh/YuuybqGUS03\n\t c39jhM0A4IPodmm2YwEfQoQpOZ0WrZwf+x9JGCCafPcxAdqlTrAbApI1qukK+k6ADk\n\t ESHxl1GPy56oA==", "From": "Mike Rapoport <rppt@kernel.org>", "To": "Andrew Morton <akpm@linux-foundation.org>", "Cc": "Andreas Larsson <andreas@gaisler.com>,\n\tBorislav Petkov <bp@alien8.de>,\n\tBrian Cain <bcain@kernel.org>,\n\tCatalin Marinas <catalin.marinas@arm.com>,\n\t\"Christophe Leroy (CS GROUP)\" <chleroy@kernel.org>,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tDave Hansen <dave.hansen@linux.intel.com>,\n\tDavid Hildenbrand <david@kernel.org>,\n\tDinh Nguyen <dinguyen@kernel.org>,\n\tGeert Uytterhoeven <geert@linux-m68k.org>,\n\tGuo Ren <guoren@kernel.org>,\n\tHelge Deller <deller@gmx.de>,\n\tHuacai Chen <chenhuacai@kernel.org>,\n\tIngo Molnar <mingo@redhat.com>,\n\tJohannes Berg <johannes@sipsolutions.net>,\n\tJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,\n\t\"Liam R. Howlett\" <Liam.Howlett@oracle.com>,\n\tLorenzo Stoakes <lorenzo.stoakes@oracle.com>,\n\tMadhavan Srinivasan <maddy@linux.ibm.com>,\n\tMagnus Lindholm <linmag7@gmail.com>,\n\tMatt Turner <mattst88@gmail.com>,\n\tMax Filippov <jcmvbkbc@gmail.com>,\n\tMichael Ellerman <mpe@ellerman.id.au>,\n\tMichal Hocko <mhocko@suse.com>,\n\tMichal Simek <monstr@monstr.eu>,\n\tMike Rapoport <rppt@kernel.org>,\n\tPalmer Dabbelt <palmer@dabbelt.com>,\n\tRichard Weinberger <richard@nod.at>,\n\tRussell King <linux@armlinux.org.uk>,\n\tStafford Horne <shorne@gmail.com>,\n\tSuren Baghdasaryan <surenb@google.com>,\n\tThomas Gleixner <tglx@kernel.org>,\n\tVineet Gupta <vgupta@kernel.org>,\n\tVlastimil Babka <vbabka@suse.cz>,\n\tWill Deacon <will@kernel.org>,\n\tlinux-alpha@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tlinux-snps-arc@lists.infradead.org,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinux-csky@vger.kernel.org,\n\tlinux-hexagon@vger.kernel.org,\n\tloongarch@lists.linux.dev,\n\tlinux-m68k@lists.linux-m68k.org,\n\tlinux-openrisc@vger.kernel.org,\n\tlinux-parisc@vger.kernel.org,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-riscv@lists.infradead.org,\n\tlinux-sh@vger.kernel.org,\n\tsparclinux@vger.kernel.org,\n\tlinux-um@lists.infradead.org,\n\tlinux-mm@kvack.org,\n\tx86@kernel.org", "Subject": "[PATCH v3 2/4] mm: rename my_zero_pfn() to zero_pfn()", "Date": "Wed, 11 Feb 2026 12:31:39 +0200", "Message-ID": "<20260211103141.3215197-3-rppt@kernel.org>", "X-Mailer": "git-send-email 2.51.0", "In-Reply-To": "<20260211103141.3215197-1-rppt@kernel.org>", "References": "<20260211103141.3215197-1-rppt@kernel.org>", "Precedence": "bulk", "X-Mailing-List": "sparclinux@vger.kernel.org", "List-Id": "<sparclinux.vger.kernel.org>", "List-Subscribe": "<mailto:sparclinux+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:sparclinux+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Spam-Status": "No, score=-1.2 required=5.0 tests=ARC_SIGNED,ARC_VALID,\n\tDKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DMARC_PASS,\n\tMAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=disabled\n\tversion=4.0.1", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on gandalf.ozlabs.org" }, "content": "From: \"Mike Rapoport (Microsoft)\" <rppt@kernel.org>\n\nmy_zero_pfn() is a silly name.\n\nRename zero_pfn variable to zero_page_pfn and my_zero_pfn() function to\nzero_pfn().\n\nWhile on it, move extern declarations of zero_page_pfn outside the\nfunctions that use it and add a comment about what ZERO_PAGE is.\n\nSigned-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>\n---\n arch/x86/kvm/mmu/spte.h | 2 +-\n fs/dax.c | 2 +-\n fs/proc/vmcore.c | 2 +-\n include/linux/pgtable.h | 28 ++++++++++++++++++++--------\n mm/huge_memory.c | 2 +-\n mm/memory.c | 2 +-\n mm/migrate.c | 2 +-\n mm/mm_init.c | 10 +++++-----\n mm/userfaultfd.c | 4 ++--\n 9 files changed, 33 insertions(+), 21 deletions(-)", "diff": "diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h\nindex 91ce29fd6f1b..8c0ffa2cded6 100644\n--- a/arch/x86/kvm/mmu/spte.h\n+++ b/arch/x86/kvm/mmu/spte.h\n@@ -248,7 +248,7 @@ extern u64 __read_mostly shadow_nonpresent_or_rsvd_lower_gfn_mask;\n \n static inline hpa_t kvm_mmu_get_dummy_root(void)\n {\n-\treturn my_zero_pfn(0) << PAGE_SHIFT;\n+\treturn zero_pfn(0) << PAGE_SHIFT;\n }\n \n static inline bool kvm_mmu_is_dummy_root(hpa_t shadow_page)\ndiff --git a/fs/dax.c b/fs/dax.c\nindex 289e6254aa30..b78cff9c91b3 100644\n--- a/fs/dax.c\n+++ b/fs/dax.c\n@@ -1360,7 +1360,7 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, struct vm_fault *vmf,\n {\n \tstruct inode *inode = iter->inode;\n \tunsigned long vaddr = vmf->address;\n-\tunsigned long pfn = my_zero_pfn(vaddr);\n+\tunsigned long pfn = zero_pfn(vaddr);\n \tvm_fault_t ret;\n \n \t*entry = dax_insert_entry(xas, vmf, iter, *entry, pfn, DAX_ZERO_PAGE);\ndiff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c\nindex f188bd900eb2..44d15436439f 100644\n--- a/fs/proc/vmcore.c\n+++ b/fs/proc/vmcore.c\n@@ -525,7 +525,7 @@ static int remap_oldmem_pfn_checked(struct vm_area_struct *vma,\n {\n \tunsigned long map_size;\n \tunsigned long pos_start, pos_end, pos;\n-\tunsigned long zeropage_pfn = my_zero_pfn(0);\n+\tunsigned long zeropage_pfn = zero_pfn(0);\n \tsize_t len = 0;\n \n \tpos_start = pfn;\ndiff --git a/include/linux/pgtable.h b/include/linux/pgtable.h\nindex 08a88b0d56e5..9bacf4df9769 100644\n--- a/include/linux/pgtable.h\n+++ b/include/linux/pgtable.h\n@@ -1882,27 +1882,39 @@ static inline void pfnmap_setup_cachemode_pfn(unsigned long pfn, pgprot_t *prot)\n \tpfnmap_setup_cachemode(pfn, PAGE_SIZE, prot);\n }\n \n+/*\n+ * ZERO_PAGE() is global shared page(s) that is always zero. It is used for\n+ * zero-mapped memory areas, CoW etc.\n+ *\n+ * On architectures that __HAVE_COLOR_ZERO_PAGE there are several such pages\n+ * for different ranges in the virtual address space.\n+ *\n+ * zero_page_pfn identifies the first (or the only) pfn for these pages.\n+ */\n #ifdef __HAVE_COLOR_ZERO_PAGE\n static inline int is_zero_pfn(unsigned long pfn)\n {\n-\textern unsigned long zero_pfn;\n-\tunsigned long offset_from_zero_pfn = pfn - zero_pfn;\n+\textern unsigned long zero_page_pfn;\n+\tunsigned long offset_from_zero_pfn = pfn - zero_page_pfn;\n+\n \treturn offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);\n }\n \n-#define my_zero_pfn(addr)\tpage_to_pfn(ZERO_PAGE(addr))\n+#define zero_pfn(addr)\tpage_to_pfn(ZERO_PAGE(addr))\n \n #else\n static inline int is_zero_pfn(unsigned long pfn)\n {\n-\textern unsigned long zero_pfn;\n-\treturn pfn == zero_pfn;\n+\textern unsigned long zero_page_pfn;\n+\n+\treturn pfn == zero_page_pfn;\n }\n \n-static inline unsigned long my_zero_pfn(unsigned long addr)\n+static inline unsigned long zero_pfn(unsigned long addr)\n {\n-\textern unsigned long zero_pfn;\n-\treturn zero_pfn;\n+\textern unsigned long zero_page_pfn;\n+\n+\treturn zero_page_pfn;\n }\n #endif /* __HAVE_COLOR_ZERO_PAGE */\n \ndiff --git a/mm/huge_memory.c b/mm/huge_memory.c\nindex 44ff8a648afd..bc15fd152526 100644\n--- a/mm/huge_memory.c\n+++ b/mm/huge_memory.c\n@@ -2968,7 +2968,7 @@ static void __split_huge_zero_page_pmd(struct vm_area_struct *vma,\n \tfor (i = 0, addr = haddr; i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE) {\n \t\tpte_t entry;\n \n-\t\tentry = pfn_pte(my_zero_pfn(addr), vma->vm_page_prot);\n+\t\tentry = pfn_pte(zero_pfn(addr), vma->vm_page_prot);\n \t\tentry = pte_mkspecial(entry);\n \t\tif (pmd_uffd_wp(old_pmd))\n \t\t\tentry = pte_mkuffd_wp(entry);\ndiff --git a/mm/memory.c b/mm/memory.c\nindex 51d2018a387a..ae610afa9cea 100644\n--- a/mm/memory.c\n+++ b/mm/memory.c\n@@ -5165,7 +5165,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)\n \t/* Use the zero-page for reads */\n \tif (!(vmf->flags & FAULT_FLAG_WRITE) &&\n \t\t\t!mm_forbids_zeropage(vma->vm_mm)) {\n-\t\tentry = pte_mkspecial(pfn_pte(my_zero_pfn(vmf->address),\n+\t\tentry = pte_mkspecial(pfn_pte(zero_pfn(vmf->address),\n \t\t\t\t\t\tvma->vm_page_prot));\n \t\tvmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd,\n \t\t\t\tvmf->address, &vmf->ptl);\ndiff --git a/mm/migrate.c b/mm/migrate.c\nindex 1bf2cf8c44dd..739c4e03769b 100644\n--- a/mm/migrate.c\n+++ b/mm/migrate.c\n@@ -321,7 +321,7 @@ static bool try_to_map_unused_to_zeropage(struct page_vma_mapped_walk *pvmw,\n \tif (!pages_identical(page, ZERO_PAGE(0)))\n \t\treturn false;\n \n-\tnewpte = pte_mkspecial(pfn_pte(my_zero_pfn(pvmw->address),\n+\tnewpte = pte_mkspecial(pfn_pte(zero_pfn(pvmw->address),\n \t\t\t\t\tpvmw->vma->vm_page_prot));\n \n \tif (pte_swp_soft_dirty(old_pte))\ndiff --git a/mm/mm_init.c b/mm/mm_init.c\nindex dcf9eff34f83..a0ca236eb4f5 100644\n--- a/mm/mm_init.c\n+++ b/mm/mm_init.c\n@@ -53,8 +53,8 @@ EXPORT_SYMBOL(mem_map);\n void *high_memory;\n EXPORT_SYMBOL(high_memory);\n \n-unsigned long zero_pfn __ro_after_init;\n-EXPORT_SYMBOL(zero_pfn);\n+unsigned long zero_page_pfn __ro_after_init;\n+EXPORT_SYMBOL(zero_page_pfn);\n \n #ifdef CONFIG_DEBUG_MEMORY_INIT\n int __meminitdata mminit_loglevel;\n@@ -2670,12 +2670,12 @@ static void __init mem_init_print_info(void)\n \t\t);\n }\n \n-static int __init init_zero_pfn(void)\n+static int __init init_zero_page_pfn(void)\n {\n-\tzero_pfn = page_to_pfn(ZERO_PAGE(0));\n+\tzero_page_pfn = page_to_pfn(ZERO_PAGE(0));\n \treturn 0;\n }\n-early_initcall(init_zero_pfn);\n+early_initcall(init_zero_page_pfn);\n \n void __init __weak arch_mm_preinit(void)\n {\ndiff --git a/mm/userfaultfd.c b/mm/userfaultfd.c\nindex 927086bb4a3c..e19872e51878 100644\n--- a/mm/userfaultfd.c\n+++ b/mm/userfaultfd.c\n@@ -357,7 +357,7 @@ static int mfill_atomic_pte_zeropage(pmd_t *dst_pmd,\n \tif (mm_forbids_zeropage(dst_vma->vm_mm))\n \t\treturn mfill_atomic_pte_zeroed_folio(dst_pmd, dst_vma, dst_addr);\n \n-\t_dst_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr),\n+\t_dst_pte = pte_mkspecial(pfn_pte(zero_pfn(dst_addr),\n \t\t\t\t\t dst_vma->vm_page_prot));\n \tret = -EAGAIN;\n \tdst_pte = pte_offset_map_lock(dst_vma->vm_mm, dst_pmd, dst_addr, &ptl);\n@@ -1229,7 +1229,7 @@ static int move_zeropage_pte(struct mm_struct *mm,\n \t\treturn -EAGAIN;\n \t}\n \n-\tzero_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr),\n+\tzero_pte = pte_mkspecial(pfn_pte(zero_pfn(dst_addr),\n \t\t\t\t\t dst_vma->vm_page_prot));\n \tptep_clear_flush(src_vma, src_addr, src_pte);\n \tset_pte_at(mm, dst_addr, dst_pte, zero_pte);\n", "prefixes": [ "v3", "2/4" ] }