Commit ed3bf863 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Ingo Molnar
Browse files

objtool: Remove newlines and tabs from annotation macros 



Remove newlines and tabs from the annotation macros so the invoking code
can insert them as needed to match the style of the surrounding code.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://patch.msgid.link/66305834c2eb78f082217611b756231ae9c0b555.1764694625.git.jpoimboe@kernel.org
parent 305c8dc4

arch/x86/include/asm/alternative.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static inline int alternatives_text_reserved(void *start, void *end) 


#define ALTINSTR_REPLACEMENT(newinstr)		/* replacement */	\

	".pushsection .altinstr_replacement, \"ax\"\n"			\

	ANNOTATE_DATA_SPECIAL						\

	ANNOTATE_DATA_SPECIAL "\n"					\

	"# ALT: replacement\n"						\

	"774:\n\t" newinstr "\n775:\n"					\

	".popsection\n"

arch/x86/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ extern void __WARN_trap(struct bug_entry *bug, ...); 


#define _BUG_FLAGS_ASM(format, file, line, flags, size, extra)		\

	".pushsection __bug_table,\"aw\"\n\t"				\

	ANNOTATE_DATA_SPECIAL						\

	ANNOTATE_DATA_SPECIAL "\n\t"					\

	"2:\n\t"							\

	__BUG_ENTRY(format, file, line, flags)				\

	"\t.org 2b + " size "\n"					\

arch/x86/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static __always_inline bool _static_cpu_has(u16 bit) 
	asm goto(ALTERNATIVE_TERNARY("jmp 6f", %c[feature], "", "jmp %l[t_no]")

		".pushsection .altinstr_aux,\"ax\"\n"

		"6:\n"

		ANNOTATE_DATA_SPECIAL

		ANNOTATE_DATA_SPECIAL "\n"

		" testb %[bitnum], %a[cap_byte]\n"

		" jnz %l[t_yes]\n"

		" jmp %l[t_no]\n"

arch/x86/include/asm/irq_stack.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 


#define ASM_CALL_ARG0							\

	"1: call %c[__func]				\n"		\

	ANNOTATE_REACHABLE(1b)

	ANNOTATE_REACHABLE(1b) "			\n"



#define ASM_CALL_ARG1							\

	"movq	%[arg1], %%rdi				\n"		\

arch/x86/include/asm/jump_label.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define JUMP_TABLE_ENTRY(key, label)			\

	".pushsection __jump_table,  \"aw\" \n\t"	\

	_ASM_ALIGN "\n\t"				\

	ANNOTATE_DATA_SPECIAL				\

	ANNOTATE_DATA_SPECIAL "\n"			\

	".long 1b - . \n\t"				\

	".long " label " - . \n\t"			\

	_ASM_PTR " " key " - . \n\t"			\