Skip to contentSkip to conversation

proc-fix-documentation-and-description-of-pagemap.patch removed from -mm tree

merged Andrew Morton 1 participant 1 message Mar 6, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The patch titled
Subject: proc: fix documentation and description of pagemap
has been removed from the -mm tree. Its filename was
proc-fix-documentation-and-description-of-pagemap.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Yun Zhou <[email protected]>
Subject: proc: fix documentation and description of pagemap

Since bit 57 was exported for uffd-wp write-protected(commit fb8e37f35a2f), fixing it can reduce some unnecessary confusion.

Fixes fb8e37f35a2fe1 ("mm/pagemap: export uffd-wp protection information")
Cc Jonathan Corbet <[email protected]>
Cc Tiberiu A Georgescu <[email protected]>
Cc Florian Schmidt <[email protected]>
Cc Ivan Teterevkov <[email protected]>
Cc SeongJae Park <[email protected]>
Cc Yang Shi <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Axel Rasmussen <[email protected]>
Cc Miaohe Lin <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc Colin Cross <[email protected]>
Cc Alistair Popple <[email protected]>

---

 Documentation/admin-guide/mm/pagemap.rst |    2 +-
 fs/proc/task_mmu.c                       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
Documentation/admin-guide/mm/pagemap.rst renamed from Documentation/admin-guide/mm/pagemap.rst~proc-fix-documentation-and-description-of-pagemap +1 -1
@@ -23,7 +23,7 @@ There are four components to pagemap:
     * Bit  56    page exclusively mapped (since 4.2)
     * Bit  57    pte is uffd-wp write-protected (since 5.13) (see
       :ref:`Documentation/admin-guide/mm/userfaultfd.rst <userfaultfd>`)
-    * Bits 57-60 zero
+    * Bits 58-60 zero
     * Bit  61    page is file-page or shared-anon (since 3.5)
     * Bit  62    page swapped
     * Bit  63    page present
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~proc-fix-documentation-and-description-of-pagemap +2 -1
@@ -1597,7 +1597,8 @@ static const struct mm_walk_ops pagemap_
  * Bits 5-54  swap offset if swapped
  * Bit  55    pte is soft-dirty (see Documentation/admin-guide/mm/soft-dirty.rst)
  * Bit  56    page exclusively mapped
- * Bits 57-60 zero
+ * Bit  57    pte is uffd-wp write-protected
+ * Bits 58-60 zero
  * Bit  61    page is file-page or shared-anon
  * Bit  62    page swapped
  * Bit  63    page present

_

Patches currently in -mm which might be from [email protected] are