1 files changed, 4 insertions, 10 deletions

diff --git a/mm/rmap.c b/mm/rmap.c
index 504757624cce..f69d5342ce7f 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -443,8 +443,6 @@ int page_referenced(struct page *page, int is_locked, int ignore_token)
 void page_add_anon_rmap(struct page *page,
         struct vm_area_struct *vma, unsigned long address)
 {
-        BUG_ON(PageReserved(page));
-
         if (atomic_inc_and_test(&page->_mapcount)) {
                 struct anon_vma *anon_vma = vma->anon_vma;
 
@@ -468,8 +466,7 @@ void page_add_anon_rmap(struct page *page,
 void page_add_file_rmap(struct page *page)
 {
         BUG_ON(PageAnon(page));
-        if (!pfn_valid(page_to_pfn(page)) || PageReserved(page))
-                return;
+        BUG_ON(!pfn_valid(page_to_pfn(page)));
 
         if (atomic_inc_and_test(&page->_mapcount))
                 inc_page_state(nr_mapped);
@@ -483,8 +480,6 @@ void page_add_file_rmap(struct page *page)
  */
 void page_remove_rmap(struct page *page)
 {
-        BUG_ON(PageReserved(page));
-
         if (atomic_add_negative(-1, &page->_mapcount)) {
                 BUG_ON(page_mapcount(page) < 0);
                 /*
@@ -640,13 +635,13 @@ static void try_to_unmap_cluster(unsigned long cursor,
                         continue;
 
                 pfn = pte_pfn(*pte);
-                if (!pfn_valid(pfn))
+                if (unlikely(!pfn_valid(pfn))) {
+                        print_bad_pte(vma, *pte, address);
                         continue;
+                }
 
                 page = pfn_to_page(pfn);
                 BUG_ON(PageAnon(page));
-                if (PageReserved(page))
-                        continue;
 
                 if (ptep_clear_flush_young(vma, address, pte))
                         continue;
@@ -808,7 +803,6 @@ int try_to_unmap(struct page *page)
 {
         int ret;
 
-        BUG_ON(PageReserved(page));
         BUG_ON(!PageLocked(page));
 
         if (PageAnon(page))