Arch. timers and VGIC patches broke the ability to compile as a module. This should probably eventually be fixed, but for now we simply disable module compilation. Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx> --- arch/arm/kvm/Kconfig | 2 +- arch/arm/kvm/Makefile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 880282e..ade2673 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -17,7 +17,7 @@ menuconfig VIRTUALIZATION if VIRTUALIZATION config KVM - tristate "Kernel-based Virtual Machine (KVM) support" + bool "Kernel-based Virtual Machine (KVM) support" select PREEMPT_NOTIFIERS select ANON_INODES select KVM_MMIO diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index 06c58b5..67dc2c1 100644 --- a/arch/arm/kvm/Makefile +++ b/arch/arm/kvm/Makefile @@ -16,10 +16,7 @@ AFLAGS_interrupts.o := -Wa,-march=armv7-a$(plus_virt) obj-$(CONFIG_KVM_ARM_HOST) += init.o interrupts.o exports.o -kvm-arm-y += $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) - -kvm-arm-y += arm.o guest.o mmu.o emulate.o reset.o coproc.o - -obj-$(CONFIG_KVM) += kvm-arm.o +obj-$(CONFIG_KVM_ARM_HOST) += $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) +obj-$(CONFIG_KVM_ARM_HOST) += arm.o guest.o mmu.o emulate.o reset.o coproc.o obj-$(CONFIG_KVM_ARM_VGIC) += vgic.o obj-$(CONFIG_KVM_ARM_TIMER) += timer.o -- 1.7.9.5 _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
