Skip to content

Commit da8f2e2

Browse files
olofjtorvalds
authored andcommitted
ARM: tegra: fix regression from addruart rewrite
Commit 0ea1293 ("arm: return both physical and virtual addresses from addruart") took out the test for MMU on/off but didn't switch the ldr instructions to no longer be conditionals based on said test. Fix that. Signed-off-by: Olof Johansson <[email protected]> Acked-by: Colin Cross <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 7787d2c commit da8f2e2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/mach-tegra/include/mach/debug-macro.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <mach/io.h>
2222

2323
.macro addruart, rp, rv
24-
ldreq \rp, =IO_APB_PHYS @ physical
25-
ldrne \rv, =IO_APB_VIRT @ virtual
24+
ldr \rp, =IO_APB_PHYS @ physical
25+
ldr \rv, =IO_APB_VIRT @ virtual
2626
#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
2727
#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
2828
#elif defined(CONFIG_TEGRA_DEBUG_UARTA)

0 commit comments

Comments
 (0)