X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fasm-v850%2Fpage.h;h=d693ffb1364d2ae954210cea7542469a1f4a46f9;hb=2d896c780db9cda5dc102bf7a0a2cd4394c1342e;hp=d6091622935d101df33649bbde47b6a28f7b40da;hpb=e0d7ff168a71299919f01500b3d507aae0c67513;p=karo-tx-linux.git

diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index d6091622935d..d693ffb1364d 100644
--- a/include/asm-v850/page.h
+++ b/include/asm-v850/page.h
@@ -14,6 +14,8 @@
 #ifndef __V850_PAGE_H__
 #define __V850_PAGE_H__
 
+#ifdef __KERNEL__
+
 #include <asm/machdep.h>
 
 
@@ -32,7 +34,6 @@
 #endif
 
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #define STRICT_MM_TYPECHECKS
@@ -98,25 +99,6 @@ typedef unsigned long pgprot_t;
 #define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
 
 
-#ifndef __ASSEMBLY__
-
-/* Pure 2^n version of get_order */
-extern __inline__ int get_order (unsigned long size)
-{
-	int order;
-
-	size = (size-1) >> (PAGE_SHIFT-1);
-	order = -1;
-	do {
-		size >>= 1;
-		order++;
-	} while (size);
-	return order;
-}
-
-#endif /* !__ASSEMBLY__ */
-
-
 /* No current v850 processor has virtual memory.  */
 #define __virt_to_phys(addr)	(addr)
 #define __phys_to_virt(addr)	(addr)
@@ -130,8 +112,7 @@ extern __inline__ int get_order (unsigned long size)
 #define page_to_virt(page) \
   ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
 
-#define pfn_to_page(pfn)	virt_to_page (pfn_to_virt (pfn))
-#define page_to_pfn(page)	virt_to_pfn (page_to_virt (page))
+#define ARCH_PFN_OFFSET		(PAGE_OFFSET >> PAGE_SHIFT)
 #define pfn_valid(pfn)	        ((pfn) < max_mapnr)
 
 #define	virt_addr_valid(kaddr)						\
@@ -142,6 +123,9 @@ extern __inline__ int get_order (unsigned long size)
 #define __va(x)		     ((void *)__phys_to_virt ((unsigned long)(x)))
 
 
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
 #endif /* KERNEL */
 
 #endif /* __V850_PAGE_H__ */