From 4efebc9981ec1a8df60713c994820e57eb74cad0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 08:06:46 +0200 Subject: [PATCH] Revert "ANDROID: x86: disable STACK_VALIDATION with LTO_CLANG" This reverts commit d5a3eb9d1e500e0e0db94d4aff7c4cdd03547dc9 as the LTO feature causes merge issues with 5.8-rc1. So remove it for now and allow the developer to add the latest version of the patches later on. Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: Iee3a7be4b32a8c37d55962317421330ff03de24c --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 763ca0f06a8d..726ec7b896d7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -213,7 +213,7 @@ config X86 select HAVE_RELIABLE_STACKTRACE if X86_64 && (UNWINDER_FRAME_POINTER || UNWINDER_ORC) && STACK_VALIDATION select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_STACKPROTECTOR if CC_HAS_SANE_STACKPROTECTOR - select HAVE_STACK_VALIDATION if X86_64 && !LTO_CLANG + select HAVE_STACK_VALIDATION if X86_64 select HAVE_RSEQ select HAVE_SYSCALL_TRACEPOINTS select HAVE_UNSTABLE_SCHED_CLOCK