From d78e2a17bc7452ccbe32d8804aa5e770921a1953 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 9 Jun 2020 12:47:13 +0100 Subject: [PATCH] Revert "FROMLIST: arm64: disable SCS for hypervisor code" 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 4756bebcd2875c68105882d0f5bfc01fea021b04. Signed-off-by: Will Deacon Change-Id: I26b3710cb4baa8ef62f7f50966975d21d179d4fe --- arch/arm64/kvm/hyp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 67aa18a539ea..b2d807634186 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -29,5 +29,5 @@ KASAN_SANITIZE := n UBSAN_SANITIZE := n KCOV_INSTRUMENT := n -# remove SCS and CFI flags from all objects in this directory -KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS) $(CC_FLAGS_CFI), $(KBUILD_CFLAGS)) +# remove CFI flags from all objects in this directory +KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_CFI), $(KBUILD_CFLAGS))