From 72091fcab8161e21cdfe01dd2b0b8ba906a107e7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 14:52:18 +0200 Subject: [PATCH] Revert "ANDROID: arm64: kvm: disable CFI" This reverts commit e7b2999eae3fa970ddb8c43d8835430221ad7a7b as CFI is being removed from the tree to come back later as a "clean" set of patches. Bug: 145210207 Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: I7d7c3cb8dc4cc431180e08d0b40354b6b1ffaa8a --- arch/arm64/kvm/Makefile | 1 - arch/arm64/kvm/hyp/Makefile | 3 --- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index a22f7708901d..8d3d9513cbfe 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -4,7 +4,6 @@ # ccflags-y += -I $(srctree)/$(src) -CFLAGS_REMOVE_debug.o += $(CC_FLAGS_CFI) KVM=../../../virt/kvm diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 229db8fe68c2..8c9880783839 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -18,6 +18,3 @@ GCOV_PROFILE := n KASAN_SANITIZE := n UBSAN_SANITIZE := n KCOV_INSTRUMENT := n - -# remove CFI flags from all objects in this directory -KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_CFI), $(KBUILD_CFLAGS))