diff options
| author |   Stefan Agner <stefan@agner.ch> | 2015-05-20 00:03:50 +0200 |
|---|---|---|
| committer |   Arnd Bergmann <arnd@arndb.de> | 2015-05-20 23:09:51 +0200 |
| commit | 7505f0428fdedca11be9647cb411628ec7cb9a1a (patch) | |
| tree | f2ca809fb47c5cc349521fd787fce8f696a19d17 | |
| parent | Merge branch 'irq/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next/soc (diff) | |
| download | linux-dev-7505f0428fdedca11be9647cb411628ec7cb9a1a.tar.xz linux-dev-7505f0428fdedca11be9647cb411628ec7cb9a1a.zip | |
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>
| -rw-r--r-- | arch/arm/include/debug/efm32.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/debug.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/debug/efm32.S b/arch/arm/include/debug/efm32.S index 2265a199280c..660fa1e4b77b 100644 --- a/arch/arm/include/debug/efm32.S +++ b/arch/arm/include/debug/efm32.S @@ -16,7 +16,7 @@ #define UARTn_TXDATA 0x0034 - .macro addruart, rx, tmp + .macro addruart, rx, tmp, tmp2 ldr \rx, =(CONFIG_DEBUG_UART_PHYS) /* diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 78c91b5f97d4..ea9646cc2a0e 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -35,7 +35,7 @@ #else /* !CONFIG_MMU */ .macro addruart_current, rx, tmp1, tmp2 - addruart \rx, \tmp1 + addruart \rx, \tmp1, \tmp2 .endm #endif /* CONFIG_MMU */ |