tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ARM: tegra: fix regression from addruart rewrite

Commit 0ea129300982 ("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 <olof@lixom.net>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Olof Johansson and committed by
Linus Torvalds da8f2e24 7787d2c2

+2 -2
+2 -2
arch/arm/mach-tegra/include/mach/debug-macro.S
··· 21 21 #include <mach/io.h> 22 22 23 23 .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 26 26 #if defined(CONFIG_TEGRA_DEBUG_UART_NONE) 27 27 #error "A debug UART must be selected in the kernel config to use DEBUG_LL" 28 28 #elif defined(CONFIG_TEGRA_DEBUG_UARTA)