x86/pti: Disallow global kernel text with RANDSTRUCT

[linux-2.6-block.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index 88d01a50a0151ec80112f81348ea3115d8ad57ab..028b7210a669636bf9ce58bdd67bde71cf23bc6c 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1166,8 +1166,7 @@ static void isolate_freepages(struct compact_control *cc)
  * from the isolated freelists in the block we are migrating to.
  */
 static struct page *compaction_alloc(struct page *migratepage,
-                                       unsigned long data,
-                                       int **result)
+                                       unsigned long data)
 {
        struct compact_control *cc = (struct compact_control *)data;
        struct page *freepage;
@@ -1451,14 +1450,12 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order,
         * if compaction succeeds.
         * For costly orders, we require low watermark instead of min for
         * compaction to proceed to increase its chances.
-        * ALLOC_CMA is used, as pages in CMA pageblocks are considered
-        * suitable migration targets
         */
        watermark = (order > PAGE_ALLOC_COSTLY_ORDER) ?
                                low_wmark_pages(zone) : min_wmark_pages(zone);
        watermark += compact_gap(order);
        if (!__zone_watermark_ok(zone, 0, watermark, classzone_idx,
-                                               ALLOC_CMA, wmark_target))
+                                               0, wmark_target))
                return COMPACT_SKIPPED;
 
        return COMPACT_CONTINUE;