Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-omap1 / include / mach / debug-macro.S

diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S
index 6a0fa04..6285604 100644 (file)
--- a/arch/arm/mach-omap1/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap1/include/mach/debug-macro.S
@@ -17,6 +17,9 @@
 
 #include <plat/serial.h>
 
+#define omap_uart_v2p(x)       ((x) - PAGE_OFFSET + PLAT_PHYS_OFFSET)
+#define omap_uart_p2v(x)       ((x) - PLAT_PHYS_OFFSET + PAGE_OFFSET)
+
                .pushsection .data
 omap_uart_phys:        .word   0x0
 omap_uart_virt:        .word   0x0
@@ -33,7 +36,7 @@ omap_uart_virt:       .word   0x0
                /* Use omap_uart_phys/virt if already configured */
 9:             mrc     p15, 0, \rp, c1, c0
                tst     \rp, #1                 @ MMU enabled?
-               ldreq   \rp, =__virt_to_phys(omap_uart_phys)    @ MMU not enabled
+               ldreq   \rp, =omap_uart_v2p(omap_uart_phys)     @ MMU disabled
                ldrne   \rp, =omap_uart_phys    @ MMU enabled
                add     \rv, \rp, #4            @ omap_uart_virt
                ldr     \rp, [\rp, #0]
@@ -46,7 +49,7 @@ omap_uart_virt:       .word   0x0
                mrc     p15, 0, \rp, c1, c0
                tst     \rp, #1                 @ MMU enabled?
                ldreq   \rp, =OMAP_UART_INFO    @ MMU not enabled
-               ldrne   \rp, =__phys_to_virt(OMAP_UART_INFO)    @ MMU enabled
+               ldrne   \rp, =omap_uart_p2v(OMAP_UART_INFO)     @ MMU enabled
                ldr     \rp, [\rp, #0]
 
                /* Select the UART to use based on the UART1 scratchpad value */
@@ -73,7 +76,7 @@ omap_uart_virt:       .word   0x0
 98:            add     \rp, \rp, #0xff000000   @ phys base
                mrc     p15, 0, \rv, c1, c0
                tst     \rv, #1                 @ MMU enabled?
-               ldreq   \rv, =__virt_to_phys(omap_uart_phys)    @ MMU not enabled
+               ldreq   \rv, =omap_uart_v2p(omap_uart_phys)     @ MMU disabled
                ldrne   \rv, =omap_uart_phys    @ MMU enabled
                str     \rp, [\rv, #0]
                sub     \rp, \rp, #0xff000000   @ phys base