diff --git a/[refs] b/[refs]
index 1d00cc48a6e5..8086d7decbc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a1c49a91ad55f917a399ef2174b5ebda4283f9
+refs/heads/master: 06d5e032adcbc7d50c606a1396f00e2474e4213e
diff --git a/trunk/include/asm-generic/page.h b/trunk/include/asm-generic/page.h
index 75fec18cdc59..351889d1de19 100644
--- a/trunk/include/asm-generic/page.h
+++ b/trunk/include/asm-generic/page.h
@@ -79,8 +79,8 @@ extern unsigned long memory_end;
 #define virt_to_pfn(kaddr)	(__pa(kaddr) >> PAGE_SHIFT)
 #define pfn_to_virt(pfn)	__va((pfn) << PAGE_SHIFT)
 
-#define virt_to_page(addr)	(mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT))
-#define page_to_virt(page)	((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
+#define virt_to_page(addr)	pfn_to_page(virt_to_pfn(addr))
+#define page_to_virt(page)	pfn_to_virt(page_to_pfn(page))
 
 #ifndef page_to_phys
 #define page_to_phys(page)      ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)