| From 52a6d690e864068808500eb47a2503b4c3bc8b80 Mon Sep 17 00:00:00 2001 |
| From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Date: Wed, 10 Jul 2013 10:56:35 +0900 |
| Subject: ARM: shmobile: fix compile error when CONFIG_THUMB2_KERNEL=y |
| |
| On KZM-A9-GT board (SMP), when CONFIG_THUMB2_KERNEL=y it fails to compile |
| |
| AS arch/arm/mach-shmobile/headsmp-scu.o |
| /proj/koba/kernel/arm-soc/arch/arm/mach-shmobile/headsmp-scu.S: Assembler messages: |
| /proj/koba/kernel/arm-soc/arch/arm/mach-shmobile/headsmp-scu.S:41: Error: shift must be constant -- `bic r2,r2,r3,lsl r1' |
| make[2]: *** [arch/arm/mach-shmobile/headsmp-scu.o] Error 1 |
| make[1]: *** [arch/arm/mach-shmobile] Error 2 |
| make: *** [sub-make] Error 2 |
| |
| Instruction `bic r2,r2,r3,lsl r1' is not supported in thumb mode. This patch split it into 2 instructions. |
| |
| Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit bdea6c657e15a709e666ea707e72327c555e8e04) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/headsmp-scu.S | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S |
| index 6f986546..5ce416c0 100644 |
| --- a/arch/arm/mach-shmobile/headsmp-scu.S |
| +++ b/arch/arm/mach-shmobile/headsmp-scu.S |
| @@ -38,7 +38,8 @@ ENTRY(shmobile_boot_scu) |
| lsl r1, r1, #3 @ we will shift by cpu_id * 8 bits |
| ldr r2, [r0, #8] @ SCU Power Status Register |
| mov r3, #3 |
| - bic r2, r2, r3, lsl r1 @ Clear bits of our CPU (Run Mode) |
| + lsl r3, r3, r1 |
| + bic r2, r2, r3 @ Clear bits of our CPU (Run Mode) |
| str r2, [r0, #8] @ write back |
| |
| b shmobile_invalidate_start |
| -- |
| 1.8.4.3.gca3854a |
| |
