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 /Documentation | |
parent | aa4800e31c547ed00681318335ca2298c4bca33a (diff) | |
parent | c0cd1d541704c45030cbb2031612fdd68e8e15d5 (diff) | |
download | lwn-77856d911a8c8724ee8e2b09d55979fc1de8f1c0.tar.gz lwn-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 'Documentation')
-rw-r--r-- | Documentation/arm64/silicon-errata.rst | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index ec5f889d7681..808ade4cc008 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -120,8 +120,6 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A710 | #2224489 | ARM64_ERRATUM_2224489 | +----------------+-----------------+-----------------+-----------------------------+ -| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 | -+----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 | |