diff --git a/[refs] b/[refs]
index 728edd36b310..0420733b2d22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 064b2a0762ef7dca5f7068a90b260a309ffe2002
+refs/heads/master: 9828c185db7ab41426c03c5539b1759ccf3c28ed
diff --git a/trunk/include/asm-um/page.h b/trunk/include/asm-um/page.h
index 0229814af31e..41364330aff1 100644
--- a/trunk/include/asm-um/page.h
+++ b/trunk/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 <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif