2 files changed, 23 insertions, 7 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index 34d8ada053e4..37c73b902008 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -49,9 +49,8 @@ int isolate_lru_page(struct page *page, struct list_head *pagelist)
                 struct zone *zone = page_zone(page);
 
                 spin_lock_irq(&zone->lru_lock);
-                if (PageLRU(page)) {
+                if (PageLRU(page) && get_page_unless_zero(page)) {
                         ret = 0;
-                        get_page(page);
                         ClearPageLRU(page);
                         if (PageActive(page))
                                 del_page_from_active_list(zone, page);
@@ -632,18 +631,35 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
                         goto unlock;
                 wait_on_page_writeback(page);
         }
-
         /*
-         * Establish migration ptes or remove ptes
+         * By try_to_unmap(), page->mapcount goes down to 0 here. In this case,
+         * we cannot notice that anon_vma is freed while we migrates a page.
+         * This rcu_read_lock() delays freeing anon_vma pointer until the end
+         * of migration. File cache pages are no problem because of page_lock()
+         */
+        rcu_read_lock();
+        /*
+         * This is a corner case handling.
+         * When a new swap-cache is read into, it is linked to LRU
+         * and treated as swapcache but has no rmap yet.
+         * Calling try_to_unmap() against a page->mapping==NULL page is
+         * BUG. So handle it here.
          */
+        if (!page->mapping)
+                goto rcu_unlock;
+        /* Establish migration ptes or remove ptes */
         try_to_unmap(page, 1);
+
         if (!page_mapped(page))
                 rc = move_to_new_page(newpage, page);
 
         if (rc)
                 remove_migration_ptes(page, page);
+rcu_unlock:
+        rcu_read_unlock();
 
 unlock:
+
         unlock_page(page);
 
         if (rc != -EAGAIN) {
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 40954fb81598..6d3550ca0282 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2775,11 +2775,11 @@ unsigned long __meminit __absent_pages_in_range(int nid,
         if (i == -1)
                 return 0;
 
+        prev_end_pfn = min(early_node_map[i].start_pfn, range_end_pfn);
+
         /* Account for ranges before physical memory on this node */
         if (early_node_map[i].start_pfn > range_start_pfn)
-                hole_pages = early_node_map[i].start_pfn - range_start_pfn;
-
-        prev_end_pfn = early_node_map[i].start_pfn;
+                hole_pages = prev_end_pfn - range_start_pfn;
 
         /* Find all holes for the zone within the node */
         for (; i != -1; i = next_active_region_index_in_nid(i, nid)) {