diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2023-03-01 07:13:09 -0800 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-03-23 23:18:57 +0100 |
| commit | d88ebba45dfe67114a6ac8c6514f2c65b6ed64c7 (patch) | |
| tree | b1860421767fb8d7aef79b63c45921b72491a434 | |
| parent | 1c0c1faf5692c18c127d044ecc0cc92c7bab3477 (diff) | |
| download | linux-stable-d88ebba45dfe67114a6ac8c6514f2c65b6ed64c7.tar.gz linux-stable-d88ebba45dfe67114a6ac8c6514f2c65b6ed64c7.tar.bz2 linux-stable-d88ebba45dfe67114a6ac8c6514f2c65b6ed64c7.zip | |
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
| -rw-r--r-- | arch/x86/include/asm/unwind_hints.h | 2 | ||||
| -rw-r--r-- | include/linux/objtool.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h index e7c71750b309..97b392217c0f 100644 --- a/arch/x86/include/asm/unwind_hints.h +++ b/arch/x86/include/asm/unwind_hints.h @@ -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__ */ diff --git a/include/linux/objtool.h b/include/linux/objtool.h index 2b0258d273fc..725d7f0b6748 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -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 |