patch-2.4.4 linux/include/asm-arm/arch-ebsa110/memory.h

• Lines: 22
• Date: Thu Apr 12 12:20:31 2001
• Orig file: v2.4.3/linux/include/asm-arm/arch-ebsa110/memory.h
• Orig date: Thu Feb 8 16:32:44 2001

diff -u --recursive --new-file v2.4.3/linux/include/asm-arm/arch-ebsa110/memory.h linux/include/asm-arm/arch-ebsa110/memory.h
@@ -35,13 +35,17 @@
 #define PHYS_OFFSET	(0x00000000UL)
 
 #define __virt_to_phys__is_a_macro
-#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET)
+#define __virt_to_phys(vpage)	((vpage) - PAGE_OFFSET)
 #define __phys_to_virt__is_a_macro
-#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET)
+#define __phys_to_virt(ppage)	((ppage) + PAGE_OFFSET)
 
+/*
+ * We keep this 1:1 so that we don't interfere
+ * with the PCMCIA memory regions
+ */
 #define __virt_to_bus__is_a_macro
-#define __virt_to_bus(x)	__virt_to_phys(x)
+#define __virt_to_bus(x)	(x)
 #define __bus_to_virt__is_a_macro
-#define __bus_to_virt(x)	__phys_to_virt(x)
+#define __bus_to_virt(x)	(x)
 
 #endif