s390/expoline: use __ALIGN instead of open coded .align
authorHeiko Carstens <hca@linux.ibm.com>
Mon, 13 Mar 2023 12:50:37 +0000 (13:50 +0100)
committerHeiko Carstens <hca@linux.ibm.com>
Mon, 20 Mar 2023 10:12:47 +0000 (11:12 +0100)
Use __ALIGN instead of open coded .align statement to make sure that
external expoline thunks follow global function alignment rules.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/include/asm/nospec-insn.h

index 7e9e99523e952517a55859651fd36ea3ccb12f5d..7a946c42ad13b8de2807d755a63a78ca292f10e6 100644 (file)
@@ -2,6 +2,7 @@
 #ifndef _ASM_S390_NOSPEC_ASM_H
 #define _ASM_S390_NOSPEC_ASM_H
 
+#include <linux/linkage.h>
 #include <asm/dwarf.h>
 
 #ifdef __ASSEMBLY__
@@ -16,7 +17,7 @@
        .macro __THUNK_PROLOG_NAME name
 #ifdef CONFIG_EXPOLINE_EXTERN
        .pushsection .text,"ax",@progbits
-       .align 16,0x07
+       __ALIGN
 #else
        .pushsection .text.\name,"axG",@progbits,\name,comdat
 #endif