linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-um/page.h b/include/asm-um/page.h
index b5b65d4..0229814 100644 (file)
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
@@ -9,6 +9,7 @@
 
 struct page;
 
+#include <linux/config.h>
 #include <asm/vm-flags.h>
 
 /* PAGE_SHIFT determines the page size */
@@ -105,6 +106,9 @@ extern unsigned long uml_physmem;
 #define __pa(virt) to_phys((void *) (unsigned long) (virt))
 #define __va(phys) to_virt((unsigned long) (phys))
 
+#define page_to_pfn(page) ((page) - mem_map)
+#define pfn_to_page(pfn) (mem_map + (pfn))
+
 #define phys_to_pfn(p) ((p) >> PAGE_SHIFT)
 #define pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT)
 
@@ -113,12 +117,10 @@ extern unsigned long uml_physmem;
 
 extern struct page *arch_validate(struct page *page, gfp_t mask, int order);
 #define HAVE_ARCH_VALIDATE
-#define devmem_is_allowed(x) 1
 
-extern int arch_free_page(struct page *page, int order);
+extern void arch_free_page(struct page *page, int order);
 #define HAVE_ARCH_FREE_PAGE
 
-#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif