Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e75c3b0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
parents cf4fee50 29044ad1

arch/x86/kernel/dumpstack_64.c

+8 −2
Original line number Diff line number Diff line
@@ -120,9 +120,15 @@ fixup_bp_irq_link(unsigned long bp, unsigned long *stack, 
{

#ifdef CONFIG_FRAME_POINTER

	struct stack_frame *frame = (struct stack_frame *)bp;

	unsigned long next;



	if (!in_irq_stack(stack, irq_stack, irq_stack_end))

		return (unsigned long)frame->next_frame;

	if (!in_irq_stack(stack, irq_stack, irq_stack_end)) {

		if (!probe_kernel_address(&frame->next_frame, next))

			return next;

		else

			WARN_ONCE(1, "Perf: bad frame pointer = %p in "

				  "callchain\n", &frame->next_frame);

	}

#endif

	return bp;

}