Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
This commit is contained in:
Коммит
3e75c3b0ca
|
@ -120,9 +120,15 @@ fixup_bp_irq_link(unsigned long bp, unsigned long *stack,
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_FRAME_POINTER
|
#ifdef CONFIG_FRAME_POINTER
|
||||||
struct stack_frame *frame = (struct stack_frame *)bp;
|
struct stack_frame *frame = (struct stack_frame *)bp;
|
||||||
|
unsigned long next;
|
||||||
|
|
||||||
if (!in_irq_stack(stack, irq_stack, irq_stack_end))
|
if (!in_irq_stack(stack, irq_stack, irq_stack_end)) {
|
||||||
return (unsigned long)frame->next_frame;
|
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
|
#endif
|
||||||
return bp;
|
return bp;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче