Will Deacon
6ae96921a3
This patch effectively reverts 2df99b6397 ("ANDROID: KVM: arm64: disable
CFI for hypervisor code") now that the arm64 KVM hypervisor code builds
correctly with LTO enabled, which is also the case upstream. CFI remains
disabled, but only for the nVHE hyp object at EL2.
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Will Deacon <willdeacon@google.com>
Bug: 145210207
Change-Id: I5084f880576dd6a23b8e15eec840f666f36bd2b1
28 lines
784 B
Makefile
28 lines
784 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for Kernel-based Virtual Machine module
|
|
#
|
|
|
|
ccflags-y += -I $(srctree)/$(src)
|
|
|
|
KVM=../../../virt/kvm
|
|
|
|
obj-$(CONFIG_KVM) += kvm.o
|
|
obj-$(CONFIG_KVM) += hyp/
|
|
|
|
kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
|
|
$(KVM)/vfio.o $(KVM)/irqchip.o \
|
|
arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \
|
|
inject_fault.o va_layout.o handle_exit.o \
|
|
guest.o debug.o reset.o sys_regs.o \
|
|
vgic-sys-reg-v3.o fpsimd.o pmu.o \
|
|
arch_timer.o trng.o\
|
|
vgic/vgic.o vgic/vgic-init.o \
|
|
vgic/vgic-irqfd.o vgic/vgic-v2.o \
|
|
vgic/vgic-v3.o vgic/vgic-v4.o \
|
|
vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \
|
|
vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \
|
|
vgic/vgic-its.o vgic/vgic-debug.o
|
|
|
|
kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o
|