Commit c2272b2d authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 91a0117d

arch/s390/kernel/vdso32/vdso_user_wrapper.S

+2 −1
Original line number Diff line number Diff line 
/* 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

arch/s390/kernel/vdso64/vdso_user_wrapper.S

+3 −2
Original line number Diff line number Diff line 
/* 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