From: Josh Poimboeuf <jpoimboe@kernel.org>
To: x86@kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
live-patching@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>
Subject: [PATCH 3/6] objtool: Change UNWIND_HINT() argument order
Date: Wed, 1 Mar 2023 07:13:09 -0800 [thread overview]
Message-ID: <d994f8c29376c5618c75698df28fc03b52d3a868.1677683419.git.jpoimboe@kernel.org> (raw)
In-Reply-To: <cover.1677683419.git.jpoimboe@kernel.org>
The most important argument is 'type', make that one first.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/x86/include/asm/unwind_hints.h | 2 +-
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
--
2.39.1
next prev parent reply other threads:[~2023-03-01 15:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-01 15:13 [PATCH 0/6] x86,objtool: Split UNWIND_HINT_EMPTY in two Josh Poimboeuf
2023-03-01 15:13 ` [PATCH 1/6] objtool: Add objtool_types.h Josh Poimboeuf
2023-03-01 15:13 ` [PATCH 2/6] objtool: Use relative pointers for annotations Josh Poimboeuf
2023-03-01 15:13 ` Josh Poimboeuf [this message]
2023-03-01 15:13 ` [PATCH 4/6] x86,objtool: Introduce ORC_TYPE_* Josh Poimboeuf
2023-03-01 15:13 ` [PATCH 5/6] x86,objtool: Separate unret validation from unwind hints Josh Poimboeuf
2023-03-01 15:13 ` [PATCH 6/6] x86,objtool: Split UNWIND_HINT_EMPTY in two Josh Poimboeuf
2023-03-01 17:34 ` Steven Rostedt
2023-03-23 12:38 ` [PATCH 0/6] " Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d994f8c29376c5618c75698df28fc03b52d3a868.1677683419.git.jpoimboe@kernel.org \
--to=jpoimboe@kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox