Sparc64: Propagate forget_pte changes to sparc64 ioremap.

diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c
index 266c51b450da1ac7d342ce6986626e4ae252e30e..149dc1b4c4846ff03bbbc1001cd9356d9a6c6887 100644 (file)
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
@@ -17,20 +17,10 @@
 
 static inline void forget_pte(pte_t page)
 {
-       if (pte_none(page))
-               return;
-       if (pte_present(page)) {
-               unsigned long pfn = pte_pfn(page);
-               struct page *ptpage;
-               if (!pfn_valid(pfn))
-                       return;
-               ptpage = pfn_to_page(page);
-               if (PageReserved(ptpage))
-                       return;
-               page_cache_release(ptpage);
-               return;
+       if (!pte_none(page)) {
+               printk("forget_pte: old mapping existed!\n");
+               BUG();
        }
-       swap_free(pte_to_swp_entry(page));
 }
 
 /* Remap IO memory, the same way as remap_page_range(), but use