From: Peter Xu <peterx@redhat.com>
Subject: 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>
---

 include/linux/userfaultfd_k.h |    4 ++++
 1 file changed, 4 insertions(+)

--- a/include/linux/userfaultfd_k.h~mm-uffd-pte_marker_uffd_wp-fix
+++ a/include/linux/userfaultfd_k.h
@@ -240,8 +240,12 @@ static inline void userfaultfd_unmap_com
 
 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)
_