Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: PPC: do not compile in vfio.o unconditionally

Build on 32-bit PPC fails with the following error:

int kvm_vfio_ops_init(void)
^
In file included from arch/powerpc/kvm/../../../virt/kvm/vfio.c:21:0:
arch/powerpc/kvm/../../../virt/kvm/vfio.h:8:90: note: previous definition of ‘kvm_vfio_ops_init’ was here
arch/powerpc/kvm/../../../virt/kvm/vfio.c:292:6: error: redefinition of ‘kvm_vfio_ops_exit’
void kvm_vfio_ops_exit(void)
^
In file included from arch/powerpc/kvm/../../../virt/kvm/vfio.c:21:0:
arch/powerpc/kvm/../../../virt/kvm/vfio.h:12:91: note: previous definition of ‘kvm_vfio_ops_exit’ was here
scripts/Makefile.build:258: recipe for target arch/powerpc/kvm/../../../virt/kvm/vfio.o failed
make[3]: *** [arch/powerpc/kvm/../../../virt/kvm/vfio.o] Error 1

Check whether CONFIG_KVM_VFIO is set before including vfio.o
in the build.

Reported-by: Pranith Kumar <bobby.prani@gmail.com>
Tested-by: Pranith Kumar <bobby.prani@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

+2 -1
+2 -1
arch/powerpc/kvm/Makefile
··· 8 8 KVM := ../../../virt/kvm 9 9 10 10 common-objs-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \ 11 - $(KVM)/eventfd.o $(KVM)/vfio.o 11 + $(KVM)/eventfd.o 12 + common-objs-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o 12 13 13 14 CFLAGS_e500_mmu.o := -I. 14 15 CFLAGS_e500_mmu_host.o := -I.