diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2009-07-24 07:32:52 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-07-24 07:32:52 -0400 |
commit | 88987ef91b99cf99bc5d167caeb31d4958fbf931 (patch) | |
tree | 95557c2fe408ad98d9547025ae98b0d0c1377aa2 /arch/arm/boot | |
parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) |
Thumb-2: Add some .align statements to the .S files
Since the Thumb-2 instructions can be 16-bit wide, data in the .text
sections may not be aligned to a 32-bit word and this leads to unaligned
exceptions. This patch does not affect the ARM code generation.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/compressed/head.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 4515728c5345..82f5fcfd9567 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -291,6 +291,7 @@ wont_overwrite: mov r0, r4 | |||
291 | bl decompress_kernel | 291 | bl decompress_kernel |
292 | b call_kernel | 292 | b call_kernel |
293 | 293 | ||
294 | .align 2 | ||
294 | .type LC0, #object | 295 | .type LC0, #object |
295 | LC0: .word LC0 @ r1 | 296 | LC0: .word LC0 @ r1 |
296 | .word __bss_start @ r2 | 297 | .word __bss_start @ r2 |
@@ -589,6 +590,7 @@ call_cache_fn: adr r12, proc_types | |||
589 | * methods. Writeback caches _must_ have the flush method | 590 | * methods. Writeback caches _must_ have the flush method |
590 | * defined. | 591 | * defined. |
591 | */ | 592 | */ |
593 | .align 2 | ||
592 | .type proc_types,#object | 594 | .type proc_types,#object |
593 | proc_types: | 595 | proc_types: |
594 | .word 0x41560600 @ ARM6/610 | 596 | .word 0x41560600 @ ARM6/610 |
@@ -945,6 +947,7 @@ __armv3_mpu_cache_flush: | |||
945 | * memory, which again must be relocatable. | 947 | * memory, which again must be relocatable. |
946 | */ | 948 | */ |
947 | #ifdef DEBUG | 949 | #ifdef DEBUG |
950 | .align 2 | ||
948 | .type phexbuf,#object | 951 | .type phexbuf,#object |
949 | phexbuf: .space 12 | 952 | phexbuf: .space 12 |
950 | .size phexbuf, . - phexbuf | 953 | .size phexbuf, . - phexbuf |