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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S
index 63a15bd9b6530bdda7009000906c09db7854972e..d29dfcce948d247c8abaadad0a9cf3f9d667cc7f 100644 (file)
--- a/arch/arm/mach-tegra/sleep-tegra30.S
+++ b/arch/arm/mach-tegra/sleep-tegra30.S
@@ -66,7 +66,9 @@ ENTRY(tegra30_cpu_shutdown)
                FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG | \
                FLOW_CTRL_CSR_ENABLE
        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]
 
        /* Halt this CPU. */