Skip to content

Commit d88ebba

Browse files
jpoimboePeter Zijlstra
authored andcommitted
objtool: Change UNWIND_HINT() argument order
The most important argument is 'type', make that one first. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/d994f8c29376c5618c75698df28fc03b52d3a868.1677683419.git.jpoimboe@kernel.org
1 parent 1c0c1fa commit d88ebba

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

arch/x86/include/asm/unwind_hints.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#else
6868

6969
#define UNWIND_HINT_FUNC \
70-
UNWIND_HINT(ORC_REG_SP, 8, UNWIND_HINT_TYPE_FUNC, 0, 0)
70+
UNWIND_HINT(UNWIND_HINT_TYPE_FUNC, ORC_REG_SP, 8, 0, 0)
7171

7272
#endif /* __ASSEMBLY__ */
7373

include/linux/objtool.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#ifndef __ASSEMBLY__
1212

13-
#define UNWIND_HINT(sp_reg, sp_offset, type, signal, end) \
13+
#define UNWIND_HINT(type, sp_reg, sp_offset, signal, end) \
1414
"987: \n\t" \
1515
".pushsection .discard.unwind_hints\n\t" \
1616
/* struct unwind_hint */ \
@@ -137,8 +137,7 @@
137137

138138
#ifndef __ASSEMBLY__
139139

140-
#define UNWIND_HINT(sp_reg, sp_offset, type, signal, end) \
141-
"\n\t"
140+
#define UNWIND_HINT(type, sp_reg, sp_offset, signal, end) "\n\t"
142141
#define STACK_FRAME_NON_STANDARD(func)
143142
#define STACK_FRAME_NON_STANDARD_FP(func)
144143
#define ANNOTATE_NOENDBR

0 commit comments

Comments
 (0)