s390/vdso: use __ALIGN instead of open coded .align

Use __ALIGN instead of open coded .align statement to make sure that
vdso code follows global kernel function alignment rules.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/vdso32/vdso_user_wrapper.S b/arch/s390/kernel/vdso32/vdso_user_wrapper.S
index 3f42f27f978cfda2af169853196b9679bc2f6712..2e645003fdafc1474fc9c642667c65b4267bdf3b 100644 (file)
--- a/arch/s390/kernel/vdso32/vdso_user_wrapper.S
+++ b/arch/s390/kernel/vdso32/vdso_user_wrapper.S
@@ -1,12 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
+#include <linux/linkage.h>
 #include <asm/unistd.h>
 #include <asm/dwarf.h>
 
 .macro vdso_syscall func,syscall
        .globl __kernel_compat_\func
        .type  __kernel_compat_\func,@function
-       .align 8
+       __ALIGN
 __kernel_compat_\func:
        CFI_STARTPROC
        svc     \syscall

diff --git a/arch/s390/kernel/vdso64/vdso_user_wrapper.S b/arch/s390/kernel/vdso64/vdso_user_wrapper.S
index 97f0c0a669a59cea3a63de2d04c5cb3089b720ac..57f62596e53b958a2737f23f1985e5154179fd9e 100644 (file)
--- a/arch/s390/kernel/vdso64/vdso_user_wrapper.S
+++ b/arch/s390/kernel/vdso64/vdso_user_wrapper.S
@@ -1,4 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/linkage.h>
 #include <asm/vdso.h>
 #include <asm/unistd.h>
 #include <asm/asm-offsets.h>
@@ -16,7 +17,7 @@
 .macro vdso_func func
        .globl __kernel_\func
        .type  __kernel_\func,@function
-       .align 8
+       __ALIGN
 __kernel_\func:
        CFI_STARTPROC
        aghi    %r15,-WRAPPER_FRAME_SIZE
@@ -41,7 +42,7 @@ vdso_func getcpu
 .macro vdso_syscall func,syscall
        .globl __kernel_\func
        .type  __kernel_\func,@function
-       .align 8
+       __ALIGN
 __kernel_\func:
        CFI_STARTPROC
        svc     \syscall