Commit 6204a81a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool_urgent_for_v6.1_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fix from Borislav Petkov:

 - Fix ORC stack unwinding when GCOV is enabled

* tag 'objtool_urgent_for_v6.1_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/unwind/orc: Fix unreliable stack dump with gcov
parents 295dad10 230db824

arch/x86/kernel/unwind_orc.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task, 
	/* Otherwise, skip ahead to the user-specified starting frame: */

	while (!unwind_done(state) &&

	       (!on_stack(&state->stack_info, first_frame, sizeof(long)) ||

			state->sp < (unsigned long)first_frame))

			state->sp <= (unsigned long)first_frame))

		unwind_next_frame(state);



	return;