diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-16 13:46:41 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-16 13:46:41 -0600 |
| commit | 77856d911a8c8724ee8e2b09d55979fc1de8f1c0 (patch) | |
| tree | e895658d3ec29c6892ec20412765698c39ab3aa9 /arch/Kconfig | |
| parent | aa4800e31c547ed00681318335ca2298c4bca33a (diff) | |
| parent | c0cd1d541704c45030cbb2031612fdd68e8e15d5 (diff) | |
| download | linux-stable-77856d911a8c8724ee8e2b09d55979fc1de8f1c0.tar.gz linux-stable-77856d911a8c8724ee8e2b09d55979fc1de8f1c0.tar.bz2 linux-stable-77856d911a8c8724ee8e2b09d55979fc1de8f1c0.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon:
- Fix Kconfig dependencies to re-allow the enabling of function graph
tracer and shadow call stacks at the same time.
- Revert the workaround for CPU erratum #2645198 since the CONFIG_
guards were incorrect and the code has therefore not seen any real
exposure in -next.
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption"
ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index a3c47c2a79cd..12e3ddabac9d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -638,7 +638,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK config SHADOW_CALL_STACK bool "Shadow Call Stack" depends on ARCH_SUPPORTS_SHADOW_CALL_STACK - depends on DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER + depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER help This option enables the compiler's Shadow Call Stack, which uses a shadow stack to protect function return addresses from |