openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: arm64: Clean up kvm makefiles 

Consolidate references to the CONFIG_KVM configuration item to encompass
entire folders rather than per line.

Signed-off-by: Fuad Tabba <tabba@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200505154520.194120-5-tabba@google.com
This commit is contained in:
Fuad Tabba 2020-05-05 16:45:20 +01:00 committed by Marc Zyngier
parent f26133624d
commit 25357de01b
2 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/arm64/kvm/Makefile
View File

@ -10,30 +10,18 @@ KVM=../../../virt/kvm
obj-$(CONFIG_KVM) += kvm.o
obj-$(CONFIG_KVM) += hyp/
kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o
kvm-$(CONFIG_KVM) += psci.o perf.o
kvm-$(CONFIG_KVM) += hypercalls.o
kvm-$(CONFIG_KVM) += pvtime.o
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 regmap.o va_layout.o hyp.o hyp-init.o handle_exit.o \
guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o \
vgic-sys-reg-v3.o fpsimd.o pmu.o \
aarch32.o arch_timer.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_KVM) += inject_fault.o regmap.o va_layout.o
kvm-$(CONFIG_KVM) += hyp.o hyp-init.o handle_exit.o
kvm-$(CONFIG_KVM) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o
kvm-$(CONFIG_KVM) += vgic-sys-reg-v3.o fpsimd.o pmu.o
kvm-$(CONFIG_KVM) += aarch32.o
kvm-$(CONFIG_KVM) += arch_timer.o
kvm-$(CONFIG_KVM_ARM_PMU) += pmu-emul.o
kvm-$(CONFIG_KVM) += vgic/vgic.o
kvm-$(CONFIG_KVM) += vgic/vgic-init.o
kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o
kvm-$(CONFIG_KVM) += vgic/vgic-v2.o
kvm-$(CONFIG_KVM) += vgic/vgic-v3.o
kvm-$(CONFIG_KVM) += vgic/vgic-v4.o
kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o
kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o
kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o
kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o
kvm-$(CONFIG_KVM) += vgic/vgic-its.o
kvm-$(CONFIG_KVM) += vgic/vgic-debug.o

15
arch/arm64/kvm/hyp/Makefile
View File

@ -6,17 +6,10 @@
ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \
$(DISABLE_STACKLEAK_PLUGIN)
obj-$(CONFIG_KVM) += vgic-v3-sr.o
obj-$(CONFIG_KVM) += timer-sr.o
obj-$(CONFIG_KVM) += aarch32.o
obj-$(CONFIG_KVM) += vgic-v2-cpuif-proxy.o
obj-$(CONFIG_KVM) += sysreg-sr.o
obj-$(CONFIG_KVM) += debug-sr.o
obj-$(CONFIG_KVM) += entry.o
obj-$(CONFIG_KVM) += switch.o
obj-$(CONFIG_KVM) += fpsimd.o
obj-$(CONFIG_KVM) += tlb.o
obj-$(CONFIG_KVM) += hyp-entry.o
obj-$(CONFIG_KVM) += hyp.o
hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o sysreg-sr.o \
debug-sr.o entry.o switch.o fpsimd.o tlb.o hyp-entry.o
# KVM code is run at a different exception code with a different map, so
# compiler instrumentation that inserts callbacks or checks into the code may