Commit 5777b4b5 authored by Joseph Lo's avatar Joseph Lo Committed by Olof Johansson

ARM: tegra: fix build error when THUMB2_KERNEL enabled

This patch fix the build failure when CONFIG_THUBM2_KERNEL enabled. You
clould see the error message below:

arch/arm/mach-tegra/sleep-tegra30.S:69: Error: shift must be constant --
`orr r12,r12,r4,lsl r3'
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJoseph Lo <josephl@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarDave Martin <dave.martin@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 6e527d00
...@@ -66,7 +66,9 @@ ENTRY(tegra30_cpu_shutdown) ...@@ -66,7 +66,9 @@ ENTRY(tegra30_cpu_shutdown)
FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG | \ FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG | \
FLOW_CTRL_CSR_ENABLE FLOW_CTRL_CSR_ENABLE
mov r4, #(1 << 4) mov r4, #(1 << 4)
orr r12, r12, r4, lsl r3 ARM( orr r12, r12, r4, lsl r3 )
THUMB( lsl r4, r4, r3 )
THUMB( orr r12, r12, r4 )
str r12, [r1] str r12, [r1]
/* Halt this CPU. */ /* Halt this CPU. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment