X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-um%2Fpage.h;h=4296d3135aa996e5f3eeeaf1267338644acdc2ad;hb=3700a90f05f316948328e8d0e6a9955338a96565;hp=2c192abe9aeb0d29ac9ce1946214bc697af7c170;hpb=d6d3f5bc68be3c4ab84e6f1f9db92291da671504;p=powerpc.git

diff --git a/include/asm-um/page.h b/include/asm-um/page.h
index 2c192abe9a..4296d3135a 100644
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
@@ -9,7 +9,6 @@
 
 struct page;
 
-#include <linux/config.h>
 #include <asm/vm-flags.h>
 
 /* PAGE_SHIFT determines the page size */
@@ -106,21 +105,19 @@ 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)
 
 #define pfn_valid(pfn) ((pfn) < max_mapnr)
 #define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))
 
-extern struct page *arch_validate(struct page *page, int mask, int order);
+extern struct page *arch_validate(struct page *page, gfp_t mask, int order);
 #define HAVE_ARCH_VALIDATE
 
 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