From b92c90ee815f9493caae431cabd74a5b3da13b87 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Wed, 29 Dec 2021 17:09:00 +0800 Subject: [PATCH] arch/arm: Fix rebase error in arm_backtrace_thumb.c Signed-off-by: Xiang Xiao --- arch/arm/src/common/arm_backtrace_thumb.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/src/common/arm_backtrace_thumb.c b/arch/arm/src/common/arm_backtrace_thumb.c index 83265c5df7..d7423193d7 100644 --- a/arch/arm/src/common/arm_backtrace_thumb.c +++ b/arch/arm/src/common/arm_backtrace_thumb.c @@ -319,7 +319,7 @@ __attribute__((no_sanitize_address)) static int backtrace_push(FAR void *limit, FAR void **sp, FAR void *pc, FAR void **buffer, int size, FAR int *skip) { - int i = 1; + int i = 0; if (!in_code_region(pc)) { @@ -350,11 +350,6 @@ static int backtrace_push(FAR void *limit, FAR void **sp, FAR void *pc, { *buffer++ = pc; } - - if (ip) - { - ip = NULL; - } } return i; @@ -521,7 +516,7 @@ int up_backtrace(FAR struct tcb_s *tcb, &g_intstacktop, # endif /* CONFIG_SMP */ &sp, (FAR void *)up_backtrace + 10, - buffer, size); + buffer, size, &skip); #else ret = backtrace_push(rtcb->stack_base_ptr + rtcb->adj_stack_size,