diff options
| author | Jan Glauber <jang@linux.vnet.ibm.com> | 2011-07-24 10:48:19 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-07-24 10:48:21 +0200 |
| commit | 144d634a21caff1d54cb4bb0d073774e88130045 (patch) | |
| tree | 9eea288248189b899ee85ba346cf344e57dd402a /arch/s390/kernel/relocate_kernel64.S | |
| parent | 603d1a50acf252621a3598618b018b8123aaba64 (diff) | |
| download | op-kernel-dev-144d634a21caff1d54cb4bb0d073774e88130045.zip op-kernel-dev-144d634a21caff1d54cb4bb0d073774e88130045.tar.gz | |
[S390] fix s390 assembler code alignments
The alignment is missing for various global symbols in s390 assembly code.
With a recent gcc and an instruction like stgrl this can lead to a
specification exception if the instruction uses such a mis-aligned address.
Specify the alignment explicitely and while add it define __ALIGN for s390
and use the ENTRY define to save some lines of code.
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/relocate_kernel64.S')
| -rw-r--r-- | arch/s390/kernel/relocate_kernel64.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kernel/relocate_kernel64.S b/arch/s390/kernel/relocate_kernel64.S index 1f9ea20..7c3ce58 100644 --- a/arch/s390/kernel/relocate_kernel64.S +++ b/arch/s390/kernel/relocate_kernel64.S @@ -8,6 +8,8 @@ * */ +#include <linux/linkage.h> + /* * moves the new kernel to its destination... * %r2 = pointer to first kimage_entry_t @@ -23,8 +25,7 @@ */ .text - .globl relocate_kernel - relocate_kernel: +ENTRY(relocate_kernel) basr %r13,0 # base address .base: stnsm sys_msk-.base(%r13),0xfb # disable DAT @@ -115,6 +116,7 @@ .byte 0 .align 8 relocate_kernel_end: + .align 8 .globl relocate_kernel_len relocate_kernel_len: .quad relocate_kernel_end - relocate_kernel |
