Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes

[mirror_ubuntu-bionic-kernel.git] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index 1df011f624801ffbdf3379a6d17218d9b32280e1..b35cdebda0cef459ed55bb559b0412f7c0a53ddb 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -198,6 +198,7 @@ struct compact_control {
        const int classzone_idx;        /* zone index of a direct compactor */
        enum migrate_mode mode;         /* Async or sync migration mode */
        bool ignore_skip_hint;          /* Scan blocks even if marked skip */
+       bool no_set_skip_hint;          /* Don't mark blocks for skipping */
        bool ignore_block_suitable;     /* Scan blocks considered unsuitable */
        bool direct_compaction;         /* False from kcompactd or /proc/... */
        bool whole_zone;                /* Whole zone should/has been scanned */
@@ -327,7 +328,8 @@ static inline void mlock_migrate_page(struct page *newpage, struct page *page)
        }
 }
 
-extern pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma);
+extern pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma,
+               bool dirty);
 
 /*
  * At what user virtual address is page expected in @vma?