Commit d88ebba4 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

objtool: Change UNWIND_HINT() argument order 



The most important argument is 'type', make that one first.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/d994f8c29376c5618c75698df28fc03b52d3a868.1677683419.git.jpoimboe@kernel.org
parent 1c0c1faf

arch/x86/include/asm/unwind_hints.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#else



#define UNWIND_HINT_FUNC \

	UNWIND_HINT(ORC_REG_SP, 8, UNWIND_HINT_TYPE_FUNC, 0, 0)

	UNWIND_HINT(UNWIND_HINT_TYPE_FUNC, ORC_REG_SP, 8, 0, 0)



#endif /* __ASSEMBLY__ */

include/linux/objtool.h

+2 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#ifndef __ASSEMBLY__



#define UNWIND_HINT(sp_reg, sp_offset, type, signal, end)	\

#define UNWIND_HINT(type, sp_reg, sp_offset, signal, end)	\

	"987: \n\t"						\

	".pushsection .discard.unwind_hints\n\t"		\

	/* struct unwind_hint */				\
@@ -137,8 +137,7 @@ 


#ifndef __ASSEMBLY__



#define UNWIND_HINT(sp_reg, sp_offset, type, signal, end) \

	"\n\t"

#define UNWIND_HINT(type, sp_reg, sp_offset, signal, end) "\n\t"

#define STACK_FRAME_NON_STANDARD(func)

#define STACK_FRAME_NON_STANDARD_FP(func)

#define ANNOTATE_NOENDBR