diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-07 09:36:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-07 09:36:24 -0800 |
| commit | 135288b73cef4ccc6e0f8bf1f06bad04128b987d (patch) | |
| tree | 1a076d2af8026ef38721b209cf48b9bbebbe6adf /arch | |
| parent | d0e88885b8865ad1d57d9fd991f85d410175143b (diff) | |
| parent | 2c79bd34af13de221ddab29d8dfc9d5eeca8fe9b (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
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()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/stacktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 7f88028a00c0..b2a60e0bcfd2 100644 --- 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; |