Consolidate references to the CONFIG_KVM configuration item to encompass entire folders rather than per line. Signed-off-by: Fuad Tabba <tabba@xxxxxxxxxx> --- arch/arm64/kvm/Makefile | 41 +++++++++++++++---------------------- arch/arm64/kvm/hyp/Makefile | 16 +++++---------- 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 2d968e9ac792..a5eab7fe11a8 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -10,30 +10,21 @@ KVM=../../../virt/kvm obj-$(CONFIG_KVM) += kvm.o obj-$(CONFIG_KVM) += hyp/ -kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/hypercalls.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/pvtime.o +kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \ + $(KVM)/vfio.o \ + $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o $(KVM)/arm/psci.o \ + $(KVM)/arm/perf.o $(KVM)/arm/hypercalls.o $(KVM)/arm/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 \ + $(KVM)/arm/aarch32.o \ + $(KVM)/arm/vgic/vgic.o $(KVM)/arm/vgic/vgic-init.o \ + $(KVM)/arm/vgic/vgic-irqfd.o $(KVM)/arm/vgic/vgic-v2.o \ + $(KVM)/arm/vgic/vgic-v3.o $(KVM)/arm/vgic/vgic-v4.o \ + $(KVM)/arm/vgic/vgic-mmio.o $(KVM)/arm/vgic/vgic-mmio-v2.o \ + $(KVM)/arm/vgic/vgic-mmio-v3.o $(KVM)/arm/vgic/vgic-kvm-device.o \ + $(KVM)/arm/vgic/vgic-its.o $(KVM)/arm/vgic/vgic-debug.o \ + $(KVM)/irqchip.o \ + $(KVM)/arm/arch_timer.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) += $(KVM)/arm/aarch32.o - -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-init.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-irqfd.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v2.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v3.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v4.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio-v2.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio-v3.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-kvm-device.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-its.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-debug.o -kvm-$(CONFIG_KVM) += $(KVM)/irqchip.o -kvm-$(CONFIG_KVM) += $(KVM)/arm/arch_timer.o kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index ad4c173ed036..9358fbd123c0 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -8,18 +8,12 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \ KVM=../../../../virt/kvm -obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/vgic-v3-sr.o -obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/timer-sr.o -obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/aarch32.o +obj-$(CONFIG_KVM) += hyp.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 +hyp-y := $(KVM)/arm/hyp/vgic-v3-sr.o $(KVM)/arm/hyp/timer-sr.o \ + $(KVM)/arm/hyp/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 -- 2.26.0.110.g2183baf09c-goog _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
