[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>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/s390/kernel/relocate_kernel.S b/arch/s390/kernel/relocate_kernel.S
index 3b456b80bcee..c91d70aede91 100644
--- a/arch/s390/kernel/relocate_kernel.S
+++ b/arch/s390/kernel/relocate_kernel.S
@@ -8,6 +8,8 @@
  *
  */
 
+#include <linux/linkage.h>
+
 /*
  * moves the new kernel to its destination...
  * %r2 = pointer to first kimage_entry_t
@@ -22,8 +24,7 @@
  */
 
         .text
-        .globl          relocate_kernel
-        relocate_kernel:
+ENTRY(relocate_kernel)
                 basr    %r13,0          # base address
         .base:
                 stnsm   sys_msk-.base(%r13),0xfb        # disable DAT
@@ -112,6 +113,7 @@
                 .byte   0
                 .align  8
         relocate_kernel_end:
+        .align 8
         .globl  relocate_kernel_len
         relocate_kernel_len:
                 .quad   relocate_kernel_end - relocate_kernel