[S390] fix s390 assembler code alignments

[deliverable/linux.git] / arch / s390 / kernel / relocate_kernel64.S

diff --git a/arch/s390/kernel/relocate_kernel64.S b/arch/s390/kernel/relocate_kernel64.S
index 1f9ea2067b5979668252ee96c34a7dbe4bf2a85b..7c3ce589a7f0cdb3ceef2b08d24977b504f80a23 100644 (file)
--- 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