From: KAMEZAWA Hiroyuki Date: Mon, 27 Mar 2006 09:15:50 +0000 (-0800) Subject: [PATCH] unify pfn_to_page: uml pfn_to_page X-Git-Tag: v2.6.17-rc1~399 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9828c185db7ab41426c03c5539b1759ccf3c28ed;p=linux-2.6-omap-h63xx.git [PATCH] unify pfn_to_page: uml pfn_to_page UML can use generic funcs. Signed-off-by: KAMEZAWA Hiroyuki Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-um/page.h b/include/asm-um/page.h index 0229814af31..41364330aff 100644 --- a/include/asm-um/page.h +++ b/include/asm-um/page.h @@ -106,9 +106,6 @@ 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) @@ -121,6 +118,7 @@ extern struct page *arch_validate(struct page *page, gfp_t mask, int order); extern void arch_free_page(struct page *page, int order); #define HAVE_ARCH_FREE_PAGE +#include #include #endif