Merge tag 'for-linux-3.3-merge-window' of git://linux-c6x.org/git/projects/linux...

[~andy/linux] / include / asm-generic / page.h

diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h
index f376db24c4a69d4fea8eda47ff7581bc7b819ee2..37d1fe28960a8ae7d82b2f804008b444c7fde556 100644 (file)
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/page.h
@@ -83,8 +83,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)