From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] kvm: Fix build error caused by redefinition Date: Mon, 21 Mar 2016 15:04:24 +0100 Message-ID: <56EFFF68.9020103@redhat.com> References: <1458363272-5296-1-git-send-email-bobby.prani@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: Pranith Kumar , Gleb Natapov , "open list:KERNEL VIRTUAL MACHINE (KVM)" , open list Return-path: In-Reply-To: <1458363272-5296-1-git-send-email-bobby.prani@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 19/03/2016 05:54, Pranith Kumar wrote: > Build on 32-bit PPC fails with the following error: >=20 > 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 defin= ition of =E2=80=98kvm_vfio_ops_init=E2=80=99 was here > arch/powerpc/kvm/../../../virt/kvm/vfio.c:292:6: error: redefinition= of =E2=80=98kvm_vfio_ops_exit=E2=80=99 > 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 defi= nition of =E2=80=98kvm_vfio_ops_exit=E2=80=99 was here > scripts/Makefile.build:258: recipe for target 'arch/powerpc/kvm/../.= =2E/../virt/kvm/vfio.o' failed > make[3]: *** [arch/powerpc/kvm/../../../virt/kvm/vfio.o] Error 1 >=20 > Fix it by enclosing the definitions within CONFIG_KVM_VFIO Please test this instead: diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 7f7b6d86ac73..eba0bea6e032 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -8,7 +8,8 @@ ccflags-y :=3D -Ivirt/kvm -Iarch/powerpc/kvm KVM :=3D ../../../virt/kvm common-objs-y =3D $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \ - $(KVM)/eventfd.o $(KVM)/vfio.o + $(KVM)/eventfd.o +common-objs-$(CONFIG_KVM_VFIO) +=3D $(KVM)/vfio.o CFLAGS_e500_mmu.o :=3D -I. CFLAGS_e500_mmu_host.o :=3D -I. Paolo