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

ARM: unify MMU/!MMU addruart calls

Remove the needless differences between MMU/!MMU addruart calls.
This allows to use the same addruart macro on SoC level. Useful
for SoC consisting of multiple CPUs with and without MMU such as
Freescale Vybrid.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Stefan Agner and committed by
Arnd Bergmann
7505f042 1b0c5097

+2 -2
+1 -1
arch/arm/include/debug/efm32.S
··· 16 16 17 17 #define UARTn_TXDATA 0x0034 18 18 19 - .macro addruart, rx, tmp 19 + .macro addruart, rx, tmp, tmp2 20 20 ldr \rx, =(CONFIG_DEBUG_UART_PHYS) 21 21 22 22 /*
+1 -1
arch/arm/kernel/debug.S
··· 35 35 36 36 #else /* !CONFIG_MMU */ 37 37 .macro addruart_current, rx, tmp1, tmp2 38 - addruart \rx, \tmp1 38 + addruart \rx, \tmp1, \tmp2 39 39 .endm 40 40 41 41 #endif /* CONFIG_MMU */