linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-v850 / page.h

diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index 018f267..b4bc85e 100644 (file)
--- a/include/asm-v850/page.h
+++ b/include/asm-v850/page.h
@@ -14,8 +14,6 @@
 #ifndef __V850_PAGE_H__
 #define __V850_PAGE_H__
 
-#ifdef __KERNEL__
-
 #include <asm/machdep.h>
 
 
@@ -34,6 +32,7 @@
 #endif
 
 
+#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #define STRICT_MM_TYPECHECKS
@@ -112,7 +111,8 @@ typedef unsigned long pgprot_t;
 #define page_to_virt(page) \
   ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
 
-#define ARCH_PFN_OFFSET                (PAGE_OFFSET >> PAGE_SHIFT)
+#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 pfn_valid(pfn)         ((pfn) < max_mapnr)
 
 #define        virt_addr_valid(kaddr)                                          \
@@ -123,11 +123,8 @@ typedef unsigned long pgprot_t;
 #define __va(x)                     ((void *)__phys_to_virt ((unsigned long)(x)))
 
 
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
-#define devmem_is_allowed(x) 1
-
 #endif /* KERNEL */
 
+#include <asm-generic/page.h>
+
 #endif /* __V850_PAGE_H__ */