Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index a2adf95b3f9c5e1e026a3d1db1cb7136c992ca83..f6fb714fa8511965330c469a03dbc03ca32201fe 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2632,7 +2632,6 @@ typedef int (*pte_fn_t)(pte_t *pte, unsigned long addr, void *data);
 extern int apply_to_page_range(struct mm_struct *mm, unsigned long address,
                               unsigned long size, pte_fn_t fn, void *data);
 
-
 #ifdef CONFIG_PAGE_POISONING
 extern bool page_poisoning_enabled(void);
 extern void kernel_poison_pages(struct page *page, int numpages, int enable);
@@ -2873,5 +2872,17 @@ static inline int pages_identical(struct page *page1, struct page *page2)
        return !memcmp_pages(page1, page2);
 }
 
+#ifdef CONFIG_MAPPING_DIRTY_HELPERS
+unsigned long clean_record_shared_mapping_range(struct address_space *mapping,
+                                               pgoff_t first_index, pgoff_t nr,
+                                               pgoff_t bitmap_pgoff,
+                                               unsigned long *bitmap,
+                                               pgoff_t *start,
+                                               pgoff_t *end);
+
+unsigned long wp_shared_mapping_range(struct address_space *mapping,
+                                     pgoff_t first_index, pgoff_t nr);
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */