Merge ath-next from ath.git

[firefly-linux-kernel-4.4.55.git] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index a4f90ba7068ef0af12ccdff8b3dc7408f772b447..efad241f7014805fbe39ae30f1e4c03a6046cfa6 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -161,13 +161,10 @@ struct compact_control {
        unsigned long migrate_pfn;      /* isolate_migratepages search base */
        enum migrate_mode mode;         /* Async or sync migration mode */
        bool ignore_skip_hint;          /* Scan blocks even if marked skip */
-       bool finished_update_free;      /* True when the zone cached pfns are
-                                        * no longer being updated
-                                        */
-       bool finished_update_migrate;
-
        int order;                      /* order a direct compactor needs */
        const gfp_t gfp_mask;           /* gfp mask of a direct compactor */
+       const int alloc_flags;          /* alloc flags of a direct compactor */
+       const int classzone_idx;        /* zone index of a direct compactor */
        struct zone *zone;
        int contended;                  /* Signal need_sched() or lock
                                         * contention detected during