Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

torvalds · torvalds · commit 135288b73cef · 2024-03-07T09:36:24.000-08:00
Pull arm64 fix from Will Deacon:
 "A lonely arm64 fix addressing a kprobes regression that we introduced
  during the merge window:

   - Fix recursive kprobes regression when probing the stack unwinder"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: prohibit probing on arch_kunwind_consume_entry()
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
@@ -247,7 +247,7 @@ struct kunwind_consume_entry_data {
 	void *cookie;
 };
 
-static bool
+static __always_inline bool
 arch_kunwind_consume_entry(const struct kunwind_state *state, void *cookie)
 {
 	struct kunwind_consume_entry_data *data = cookie;

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ struct kunwind_consume_entry_data {`
`247`	`247`	`void *cookie;`
`248`	`248`	`};`
`249`	`249`
`250`		`-static bool`
	`250`	`+static __always_inline bool`
`251`	`251`	`arch_kunwind_consume_entry(const struct kunwind_state state, void cookie)`
`252`	`252`	`{`
`253`	`253`	`struct kunwind_consume_entry_data *data = cookie;`