Skip to content

Commit 01f2cf0

Browse files
sathvika-vmpe
authored andcommitted
powerpc: Override __ALIGN and __ALIGN_STR macros
In a subsequent patch, we would want to annotate powerpc assembly functions with SYM_FUNC_START_LOCAL macro. This macro depends on __ALIGN macro. The default expansion of __ALIGN macro is: #define __ALIGN .align 4,0x90 So, override __ALIGN and __ALIGN_STR macros to use the same alignment as that of the existing _GLOBAL macro. Also, do not pad with 0x90, because repeated 0x90s are not a nop or trap on powerpc. Tested-by: Naveen N. Rao <[email protected]> Reviewed-by: Naveen N. Rao <[email protected]> Reviewed-by: Christophe Leroy <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Signed-off-by: Sathvika Vasireddy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 93e3f45 commit 01f2cf0

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/powerpc/include/asm/linkage.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
#include <asm/types.h>
66

7+
#define __ALIGN .align 2
8+
#define __ALIGN_STR ".align 2"
9+
710
#ifdef CONFIG_PPC64_ELF_ABI_V1
811
#define cond_syscall(x) \
912
asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \

0 commit comments

Comments
 (0)