[PATCH] fixpatch

[Lorenzo Stoakes]

Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx>
---
 include/linux/leafops.h  | 17 -----------------
 include/linux/mm_types.h | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/linux/leafops.h b/include/linux/leafops.h
index a1a25ca152ff..414b45a37886 100644
--- a/include/linux/leafops.h
+++ b/include/linux/leafops.h
@@ -6,23 +6,6 @@
 #include <linux/swapops.h>
 #include <linux/swap.h>

-/**
- * leaf_entry_t - Describes a page table 'leaf entry'.
- *
- * Leaf entries are an abstract representation of all page table entries which
- * are non-present. Therefore these describe:
- *
- * - None or 'empty' entries.
- *
- * - All other entries which cause page faults and therefore encode
- *   software-controlled metadata.
- *
- * NOTE: While we transition from the confusing swp_entry_t type used for this
- *       purpose, we simply alias this type. This will be removed once the
- *       transition is complete.
- */
-typedef swp_entry_t leaf_entry_t;
-
 #ifdef CONFIG_MMU

 /* Temporary until swp_entry_t eliminated. */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 5021047485a9..c9c2359ddf38 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -285,6 +285,23 @@ typedef struct {
 	unsigned long val;
 } swp_entry_t;

+/**
+ * leaf_entry_t - Describes a page table 'leaf entry'.
+ *
+ * Leaf entries are an abstract representation of all page table entries which
+ * are non-present. Therefore these describe:
+ *
+ * - None or 'empty' entries.
+ *
+ * - All other entries which cause page faults and therefore encode
+ *   software-controlled metadata.
+ *
+ * NOTE: While we transition from the confusing swp_entry_t type used for this
+ *       purpose, we simply alias this type. This will be removed once the
+ *       transition is complete.
+ */
+typedef swp_entry_t leaf_entry_t;
+
 #if defined(CONFIG_MEMCG) || defined(CONFIG_SLAB_OBJ_EXT)
 /* We have some extra room after the refcount in tail pages. */
 #define NR_PAGES_IN_LARGE_FOLIO
--
2.51.0