From: Peter Xu <peterx@redhat.com>
Date: Thu, 14 Apr 2022 19:16:49 +0000 (-0700)
Subject: fixup! mm/uffd: PTE_MARKER_UFFD_WP
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ac42f4eeecdf1281441007c6155f2f514297dc53;p=users%2Fjedix%2Flinux-maple.git

fixup! mm/uffd: PTE_MARKER_UFFD_WP

Link: https://lkml.kernel.org/r/YkzKiM8tI4+qOfXF@xz-m1.local
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h
index 4d7e0c89889f..e17a53c20b91 100644
--- a/include/linux/userfaultfd_k.h
+++ b/include/linux/userfaultfd_k.h
@@ -239,8 +239,12 @@ static inline void userfaultfd_unmap_complete(struct mm_struct *mm,
 
 static inline bool pte_marker_entry_uffd_wp(swp_entry_t entry)
 {
+#ifdef CONFIG_PTE_MARKER_UFFD_WP
 	return is_pte_marker_entry(entry) &&
 	    (pte_marker_get(entry) & PTE_MARKER_UFFD_WP);
+#else
+	return false;
+#endif
 }
 
 static inline bool pte_marker_uffd_wp(pte_t pte)