arch/arm: Fix rebase error in arm_backtrace_thumb.c
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
parent
c15195b126
commit
b92c90ee81
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user