patch-2.4.0-test7 linux/include/asm-arm/page.h

• Lines: 11
• Date: Sun Aug 13 09:54:15 2000
• Orig file: v2.4.0-test6/linux/include/asm-arm/page.h
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test6/linux/include/asm-arm/page.h linux/include/asm-arm/page.h
@@ -91,8 +91,8 @@
 #define __va(x)			((void *)__phys_to_virt((unsigned long)(x)))
 
 #ifndef CONFIG_DISCONTIGMEM
-#define MAP_NR(addr)		((__pa(addr) - PHYS_OFFSET) >> PAGE_SHIFT)
-#define virt_to_page(kaddr)	(mem_map + ((__pa(kaddr) - PHYS_OFFSET) >> PAGE_SHIFT))
+#define virt_to_page(kaddr)	(mem_map + (__pa(kaddr) >> PAGE_SHIFT) - \
+				 (PHYS_OFFSET >> PAGE_SHIFT))
 #define VALID_PAGE(page)	((page - mem_map) < max_mapnr)
 #endif