diff options
| author | Will Deacon <willdeacon@google.com> | 2020-06-09 12:56:07 +0100 |
|---|---|---|
| committer | Will Deacon <willdeacon@google.com> | 2020-06-09 12:56:14 +0100 |
| commit | d57f1523e260da29728d3638ad92b11b070545c6 (patch) | |
| tree | c8ab383cc9ce19a812faa165ec40fbe83a7fd334 | |
| parent | e8c6c2fb4be9d52f6958fef426f911bd7b477a89 (diff) | |
Revert "FROMLIST: arm64: disable function graph tracing with SCS"
Shadow call stack is now merged upstream for 5.9, so revert the patches
cherry-picked into android-mainline in preparation for pulling the upstream
version instead.
This reverts commit acd44754dda18795ccdf85260a422ec9dfe08d82.
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I6b32771c9112befb027573b5e84219ad05c7fbea
| -rw-r--r-- | arch/arm64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0bae1b2ecb9e..782076db18db 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -155,7 +155,7 @@ config ARM64 select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_ERROR_INJECTION - select HAVE_FUNCTION_GRAPH_TRACER if !SHADOW_CALL_STACK + select HAVE_FUNCTION_GRAPH_TRACER select HAVE_GCC_PLUGINS select HAVE_HW_BREAKPOINT if PERF_EVENTS select HAVE_IRQ_TIME_ACCOUNTING |