X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-um%2Fpage.h;h=0229814af31e6bedad5d66381187d21f31f85796;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=459311435857d01faf76979007c2376b01ed166e;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/asm-um/page.h b/include/asm-um/page.h
index 459311435..0229814af 100644
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
@@ -106,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)
 
@@ -114,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