Commit 135288b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents d0e88885 2c79bd34

arch/arm64/kernel/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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;