Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 959b76a

Browse files
committed
xtensa: drop ARCH_WANT_FRAME_POINTERS
ARCH_WANT_FRAME_POINTERS was enabled in the xtensa Kconfig in the commit 8f371c7 ("xtensa: enable lockdep support"), but neither windowed nor call0 xtensa ABI need frame pointers for stack tracing. Drop ARCH_WANT_FRAME_POINTERS from the xtensa Kconfig. Drop ftrace_return_address0 definition as the generic implementation is correct. Signed-off-by: Max Filippov <[email protected]>
1 parent e6807b4 commit 959b76a

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

arch/xtensa/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ config XTENSA
1616
select ARCH_USE_MEMTEST
1717
select ARCH_USE_QUEUED_RWLOCKS
1818
select ARCH_USE_QUEUED_SPINLOCKS
19-
select ARCH_WANT_FRAME_POINTERS
2019
select ARCH_WANT_IPC_PARSE_VERSION
2120
select BUILDTIME_TABLE_SORT
2221
select CLONE_BACKWARDS

arch/xtensa/include/asm/ftrace.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,8 @@
1313
#include <asm/processor.h>
1414

1515
#ifndef __ASSEMBLY__
16-
#define ftrace_return_address0 ({ unsigned long a0, a1; \
17-
__asm__ __volatile__ ( \
18-
"mov %0, a0\n" \
19-
"mov %1, a1\n" \
20-
: "=r"(a0), "=r"(a1)); \
21-
MAKE_PC_FROM_RA(a0, a1); })
22-
23-
#ifdef CONFIG_FRAME_POINTER
2416
extern unsigned long return_address(unsigned level);
2517
#define ftrace_return_address(n) return_address(n)
26-
#endif
2718
#endif /* __ASSEMBLY__ */
2819

2920
#ifdef CONFIG_FUNCTION_TRACER

arch/xtensa/kernel/stacktrace.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,6 @@ EXPORT_SYMBOL_GPL(save_stack_trace);
237237

238238
#endif
239239

240-
#ifdef CONFIG_FRAME_POINTER
241-
242240
struct return_addr_data {
243241
unsigned long addr;
244242
unsigned skip;
@@ -271,5 +269,3 @@ unsigned long return_address(unsigned level)
271269
return r.addr;
272270
}
273271
EXPORT_SYMBOL(return_address);
274-
275-
#endif

0 commit comments

Comments
 (0)