Merge branch 'upstream'

1 files changed, 2 insertions, 2 deletions

diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h
index 9122684f6c1e..ec3274b7ddf4 100644
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
@@ -152,8 +152,7 @@ extern unsigned long pfn_base;
 #define virt_to_phys            __pa
 #define phys_to_virt            __va
 
-#define pfn_to_page(pfn)        (mem_map + ((pfn)-(pfn_base)))
-#define page_to_pfn(page)       ((unsigned long)(((page) - mem_map) + pfn_base))
+#define ARCH_PFN_OFFSET         (pfn_base)
 #define virt_to_page(kaddr)     (mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT)))
 
 #define pfn_valid(pfn)          (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))
@@ -164,6 +163,7 @@ extern unsigned long pfn_base;
 
 #endif /* __KERNEL__ */
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* _SPARC_PAGE_H */