1 files changed, 2 insertions, 42 deletions

diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h
index fe95c8258cf9..ad4c5a1bc9d6 100644
--- a/include/asm-ppc/page.h
+++ b/include/asm-ppc/page.h
@@ -97,62 +97,22 @@ extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);
 extern void copy_user_page(void *to, void *from, unsigned long vaddr,
                            struct page *pg);
 
-#ifndef CONFIG_APUS
 #define PPC_MEMSTART    0
-#define PPC_PGSTART     0
 #define PPC_MEMOFFSET   PAGE_OFFSET
-#else
-extern unsigned long ppc_memstart;
-extern unsigned long ppc_pgstart;
-extern unsigned long ppc_memoffset;
-#define PPC_MEMSTART    ppc_memstart
-#define PPC_PGSTART     ppc_pgstart
-#define PPC_MEMOFFSET   ppc_memoffset
-#endif
 
-#if defined(CONFIG_APUS) && !defined(MODULE)
-/* map phys->virtual and virtual->phys for RAM pages */
-static inline unsigned long ___pa(unsigned long v)
-{
-        unsigned long p;
-        asm volatile ("1: addis %0, %1, %2;"
-                      ".section \".vtop_fixup\",\"aw\";"
-                      ".align  1;"
-                      ".long   1b;"
-                      ".previous;"
-                      : "=r" (p)
-                      : "b" (v), "K" (((-PAGE_OFFSET) >> 16) & 0xffff));
-
-        return p;
-}
-static inline void* ___va(unsigned long p)
-{
-        unsigned long v;
-        asm volatile ("1: addis %0, %1, %2;"
-                      ".section \".ptov_fixup\",\"aw\";"
-                      ".align  1;"
-                      ".long   1b;"
-                      ".previous;"
-                      : "=r" (v)
-                      : "b" (p), "K" (((PAGE_OFFSET) >> 16) & 0xffff));
-
-        return (void*) v;
-}
-#else
 #define ___pa(vaddr) ((vaddr)-PPC_MEMOFFSET)
 #define ___va(paddr) ((paddr)+PPC_MEMOFFSET)
-#endif
 
 extern int page_is_ram(unsigned long pfn);
 
 #define __pa(x) ___pa((unsigned long)(x))
 #define __va(x) ((void *)(___va((unsigned long)(x))))
 
-#define ARCH_PFN_OFFSET         (PPC_PGSTART)
+#define ARCH_PFN_OFFSET         0
 #define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define page_to_virt(page)      __va(page_to_pfn(page) << PAGE_SHIFT)
 
-#define pfn_valid(pfn)          (((pfn) - PPC_PGSTART) < max_mapnr)
+#define pfn_valid(pfn)          ((pfn) < max_mapnr)
 #define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
 
 /* Pure 2^n version of get_order */