4 files changed, 18 insertions, 23 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6a3c4a1d513f..f265d37b3152 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2611,7 +2611,7 @@ void mark_free_pages(struct zone *zone)
 }
 #endif /* CONFIG_PM */
 
-static bool free_hot_cold_page_prepare(struct page *page, unsigned long pfn)
+static bool free_unref_page_prepare(struct page *page, unsigned long pfn)
 {
         int migratetype;
 
@@ -2623,8 +2623,7 @@ static bool free_hot_cold_page_prepare(struct page *page, unsigned long pfn)
         return true;
 }
 
-static void free_hot_cold_page_commit(struct page *page, unsigned long pfn,
-                                bool cold)
+static void free_unref_page_commit(struct page *page, unsigned long pfn)
 {
         struct zone *zone = page_zone(page);
         struct per_cpu_pages *pcp;
@@ -2649,10 +2648,7 @@ static void free_hot_cold_page_commit(struct page *page, unsigned long pfn,
         }
 
         pcp = &this_cpu_ptr(zone->pageset)->pcp;
-        if (!cold)
-                list_add(&page->lru, &pcp->lists[migratetype]);
-        else
-                list_add_tail(&page->lru, &pcp->lists[migratetype]);
+        list_add(&page->lru, &pcp->lists[migratetype]);
         pcp->count++;
         if (pcp->count >= pcp->high) {
                 unsigned long batch = READ_ONCE(pcp->batch);
@@ -2663,25 +2659,24 @@ static void free_hot_cold_page_commit(struct page *page, unsigned long pfn,
 
 /*
  * Free a 0-order page
- * cold == true ? free a cold page : free a hot page
  */
-void free_hot_cold_page(struct page *page, bool cold)
+void free_unref_page(struct page *page)
 {
         unsigned long flags;
         unsigned long pfn = page_to_pfn(page);
 
-        if (!free_hot_cold_page_prepare(page, pfn))
+        if (!free_unref_page_prepare(page, pfn))
                 return;
 
         local_irq_save(flags);
-        free_hot_cold_page_commit(page, pfn, cold);
+        free_unref_page_commit(page, pfn);
         local_irq_restore(flags);
 }
 
 /*
  * Free a list of 0-order pages
  */
-void free_hot_cold_page_list(struct list_head *list, bool cold)
+void free_unref_page_list(struct list_head *list)
 {
         struct page *page, *next;
         unsigned long flags, pfn;
@@ -2689,7 +2684,7 @@ void free_hot_cold_page_list(struct list_head *list, bool cold)
         /* Prepare pages for freeing */
         list_for_each_entry_safe(page, next, list, lru) {
                 pfn = page_to_pfn(page);
-                if (!free_hot_cold_page_prepare(page, pfn))
+                if (!free_unref_page_prepare(page, pfn))
                         list_del(&page->lru);
                 set_page_private(page, pfn);
         }
@@ -2699,8 +2694,8 @@ void free_hot_cold_page_list(struct list_head *list, bool cold)
                 unsigned long pfn = page_private(page);
 
                 set_page_private(page, 0);
-                trace_mm_page_free_batched(page, cold);
-                free_hot_cold_page_commit(page, pfn, cold);
+                trace_mm_page_free_batched(page);
+                free_unref_page_commit(page, pfn);
         }
         local_irq_restore(flags);
 }
@@ -4301,7 +4296,7 @@ void __free_pages(struct page *page, unsigned int order)
 {
         if (put_page_testzero(page)) {
                 if (order == 0)
-                        free_hot_cold_page(page, false);
+                        free_unref_page(page);
                 else
                         __free_pages_ok(page, order);
         }
@@ -4359,7 +4354,7 @@ void __page_frag_cache_drain(struct page *page, unsigned int count)
                 unsigned int order = compound_order(page);
 
                 if (order == 0)
-                        free_hot_cold_page(page, false);
+                        free_unref_page(page);
                 else
                         __free_pages_ok(page, order);
         }
diff --git a/mm/rmap.c b/mm/rmap.c
index 6b5a0f219ac0..47db27f8049e 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1321,7 +1321,7 @@ void page_remove_rmap(struct page *page, bool compound)
          * It would be tidy to reset the PageAnon mapping here,
          * but that might overwrite a racing page_add_anon_rmap
          * which increments mapcount after us but sets mapping
-         * before us: so leave the reset to free_hot_cold_page,
+         * before us: so leave the reset to free_unref_page,
          * and remember that it's only reliable while mapped.
          * Leaving it set also helps swapoff to reinstate ptes
          * faster for those pages still in swapcache.
diff --git a/mm/swap.c b/mm/swap.c
index 29cf75f1a860..b480279c760c 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -76,7 +76,7 @@ static void __page_cache_release(struct page *page)
 static void __put_single_page(struct page *page)
 {
         __page_cache_release(page);
-        free_hot_cold_page(page, false);
+        free_unref_page(page);
 }
 
 static void __put_compound_page(struct page *page)
@@ -817,7 +817,7 @@ void release_pages(struct page **pages, int nr)
                 spin_unlock_irqrestore(&locked_pgdat->lru_lock, flags);
 
         mem_cgroup_uncharge_list(&pages_to_free);
-        free_hot_cold_page_list(&pages_to_free, 0);
+        free_unref_page_list(&pages_to_free);
 }
 EXPORT_SYMBOL(release_pages);
 
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2852b8c5a917..c02c850ea349 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1349,7 +1349,7 @@ keep:
 
         mem_cgroup_uncharge_list(&free_pages);
         try_to_unmap_flush();
-        free_hot_cold_page_list(&free_pages, true);
+        free_unref_page_list(&free_pages);
 
         list_splice(&ret_pages, page_list);
         count_vm_events(PGACTIVATE, pgactivate);
@@ -1824,7 +1824,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
         spin_unlock_irq(&pgdat->lru_lock);
 
         mem_cgroup_uncharge_list(&page_list);
-        free_hot_cold_page_list(&page_list, true);
+        free_unref_page_list(&page_list);
 
         /*
          * If reclaim is isolating dirty pages under writeback, it implies
@@ -2063,7 +2063,7 @@ static void shrink_active_list(unsigned long nr_to_scan,
         spin_unlock_irq(&pgdat->lru_lock);
 
         mem_cgroup_uncharge_list(&l_hold);
-        free_hot_cold_page_list(&l_hold, true);
+        free_unref_page_list(&l_hold);
         trace_mm_vmscan_lru_shrink_active(pgdat->node_id, nr_taken, nr_activate,
                         nr_deactivate, nr_rotated, sc->priority, file);
 }