patch-2.3.40 linux/include/asm-arm/page.h

• Lines: 13
• Date: Thu Jan 13 13:30:31 2000
• Orig file: v2.3.39/linux/include/asm-arm/page.h
• Orig date: Tue Nov 23 22:42:21 1999

diff -u --recursive --new-file v2.3.39/linux/include/asm-arm/page.h linux/include/asm-arm/page.h
@@ -69,9 +69,9 @@
 
 #include <asm/arch/memory.h>
 
-#define __pa(x)			((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
-#define __va(x)			((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))
-#define MAP_NR(addr)		(((unsigned long)(addr) - PAGE_OFFSET) >> PAGE_SHIFT)
+#define __pa(x)			__virt_to_phys((unsigned long)(x))
+#define __va(x)			((void *)__phys_to_virt((unsigned long)(x)))
+#define MAP_NR(addr)		((__pa(addr) - PHYS_OFFSET) >> PAGE_SHIFT)
 
 #endif