From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932383AbcCVN3F (ORCPT <rfc822;w@1wt.eu>);
	Tue, 22 Mar 2016 09:29:05 -0400
Received: from mail-yw0-f169.google.com ([209.85.161.169]:36811 "EHLO
	mail-yw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752154AbcCVN26 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 22 Mar 2016 09:28:58 -0400
From: Pranith Kumar <bobby.prani@gmail.com>
To: "Paolo Bonzini" <pbonzini@redhat.com>
Cc: "Pranith Kumar" <bobby.prani@gmail.com>, "Gleb Natapov" <gleb@kernel.org>,
        "open list\:KERNEL VIRTUAL MACHINE \(KVM\)" <kvm@vger.kernel.org>,
        "open list" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] kvm: Fix build error caused by redefinition
Message-ID: <87zitq1wd0.fsf@gmail.com>
References: <1458363272-5296-1-git-send-email-bobby.prani@gmail.com> <56EFFF68.9020103@redhat.com>
User-agent: mu4e 0.9.9.5; emacs 25.1.50.2
In-reply-to: <56EFFF68.9020103@redhat.com>
Date: Tue, 22 Mar 2016 09:28:45 -0400
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


Hi Paolo,

Paolo Bonzini writes:

>
> Please test this instead:

This patch works for me. Please feel free to add:

Tested-by: Pranith Kumar <bobby.prani@gmail.com>

>
> 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 := -Ivirt/kvm -Iarch/powerpc/kvm
>  KVM := ../../../virt/kvm
>
>  common-objs-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \
> -		$(KVM)/eventfd.o $(KVM)/vfio.o
> +		$(KVM)/eventfd.o
> +common-objs-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o
>
>  CFLAGS_e500_mmu.o := -I.
>  CFLAGS_e500_mmu_host.o := -I.
>
>
> Paolo


-- 
Pranith