linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm26 / memory.h

diff --git a/include/asm-arm26/memory.h b/include/asm-arm26/memory.h
index a65f10b..20d7861 100644 (file)
--- a/include/asm-arm26/memory.h
+++ b/include/asm-arm26/memory.h
@@ -81,7 +81,8 @@ static inline void *phys_to_virt(unsigned long x)
  *  virt_to_page(k)    convert a _valid_ virtual address to struct page *
  *  virt_addr_valid(k) indicates whether a virtual address is valid
  */
-#define ARCH_PFN_OFFSET                (PHYS_PFN_OFFSET)
+#define page_to_pfn(page)      (((page) - mem_map) + PHYS_PFN_OFFSET)
+#define pfn_to_page(pfn)       ((mem_map + (pfn)) - PHYS_PFN_OFFSET)
 #define pfn_valid(pfn)         ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
 
 #define virt_to_page(kaddr)    (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
@@ -97,5 +98,4 @@ static inline void *phys_to_virt(unsigned long x)
  */
 #define page_to_bus(page)      (page_address(page))
 
-#include <asm-generic/memory_model.h>
 #endif