diff options
author | Tetsuyuki Kobayashi <koba@kmckk.co.jp> | 2013-07-09 21:56:37 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-17 19:35:21 -0400 |
commit | 0b933cb305e7a987e0a711ee15457bd70055d682 (patch) | |
tree | edef4dfb3a21a8a360de1d943e99f8ab8017d597 | |
parent | c1d7e2e80079148626e6c411e56708d86311d31a (diff) |
ARM: shmobile: Insert align directives before 4 bytes data
In thumb2 mode instructions are not align to 4 byte. This patch insert
align directives before putting 4 byte data.
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>
-rw-r--r-- | arch/arm/mach-shmobile/headsmp-scu.S | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/headsmp.S | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/sleep-sh7372.S | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index 5ce416c090e1..0a77488df870 100644 --- a/arch/arm/mach-shmobile/headsmp-scu.S +++ b/arch/arm/mach-shmobile/headsmp-scu.S | |||
@@ -46,6 +46,7 @@ ENTRY(shmobile_boot_scu) | |||
46 | ENDPROC(shmobile_boot_scu) | 46 | ENDPROC(shmobile_boot_scu) |
47 | 47 | ||
48 | .text | 48 | .text |
49 | .align 2 | ||
49 | .globl shmobile_scu_base | 50 | .globl shmobile_scu_base |
50 | shmobile_scu_base: | 51 | shmobile_scu_base: |
51 | .space 4 | 52 | .space 4 |
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S index afed58e52ae6..dfb41dfc8948 100644 --- a/arch/arm/mach-shmobile/headsmp.S +++ b/arch/arm/mach-shmobile/headsmp.S | |||
@@ -35,6 +35,7 @@ ENTRY(shmobile_boot_vector) | |||
35 | 35 | ||
36 | ENDPROC(shmobile_boot_vector) | 36 | ENDPROC(shmobile_boot_vector) |
37 | 37 | ||
38 | .align 2 | ||
38 | .globl shmobile_boot_fn | 39 | .globl shmobile_boot_fn |
39 | shmobile_boot_fn: | 40 | shmobile_boot_fn: |
40 | 1: .space 4 | 41 | 1: .space 4 |
diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S index 53f4840e4949..9782862899e8 100644 --- a/arch/arm/mach-shmobile/sleep-sh7372.S +++ b/arch/arm/mach-shmobile/sleep-sh7372.S | |||
@@ -41,6 +41,7 @@ | |||
41 | sh7372_resume_core_standby_sysc: | 41 | sh7372_resume_core_standby_sysc: |
42 | ldr pc, 1f | 42 | ldr pc, 1f |
43 | 43 | ||
44 | .align 2 | ||
44 | .globl sh7372_cpu_resume | 45 | .globl sh7372_cpu_resume |
45 | sh7372_cpu_resume: | 46 | sh7372_cpu_resume: |
46 | 1: .space 4 | 47 | 1: .space 4 |
@@ -96,6 +97,7 @@ sh7372_do_idle_sysc: | |||
96 | 1: | 97 | 1: |
97 | b 1b | 98 | b 1b |
98 | 99 | ||
100 | .align 2 | ||
99 | kernel_flush: | 101 | kernel_flush: |
100 | .word v7_flush_dcache_all | 102 | .word v7_flush_dcache_all |
101 | #endif | 103 | #endif |