2014-06-24 06:37:09

by Michael Ellerman

[permalink] [raw]
Subject: [PATCH] powerpc/kvm: Fix build break with CONFIG_KVM_BOOK3S_64_HV=y

Commit e58e263 "PPC, KVM, CMA: use general CMA reserved area management
framework" in next-20140624 removed arch/powerpc/kvm/book3s_hv_cma.c but
neglected to update the Makefile, thus breaking the build.

Signed-off-by: Michael Ellerman <[email protected]>
---

Hi Andrew,

This is in your akpm-current and is breaking some of the builds for
powerpc in linux-next. Squashing this fix into the original patch would
be best for us.

cheers

arch/powerpc/kvm/Makefile | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index ce569b6..72905c3 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -90,7 +90,6 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
book3s_hv_rm_mmu.o \
book3s_hv_ras.o \
book3s_hv_builtin.o \
- book3s_hv_cma.o \
$(kvm-book3s_64-builtin-xics-objs-y)
endif

--
1.9.1


2014-06-24 06:46:53

by Joonsoo Kim

[permalink] [raw]
Subject: Re: [PATCH] powerpc/kvm: Fix build break with CONFIG_KVM_BOOK3S_64_HV=y

On Tue, Jun 24, 2014 at 04:36:47PM +1000, Michael Ellerman wrote:
> Commit e58e263 "PPC, KVM, CMA: use general CMA reserved area management
> framework" in next-20140624 removed arch/powerpc/kvm/book3s_hv_cma.c but
> neglected to update the Makefile, thus breaking the build.
>
> Signed-off-by: Michael Ellerman <[email protected]>
> ---
>
> Hi Andrew,
>
> This is in your akpm-current and is breaking some of the builds for
> powerpc in linux-next. Squashing this fix into the original patch would
> be best for us.
>

I sent really same patch 10 minutes ago. :)

Thanks.

2014-06-24 07:12:22

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc/kvm: Fix build break with CONFIG_KVM_BOOK3S_64_HV=y

On Tue, 2014-06-24 at 15:51 +0900, Joonsoo Kim wrote:
> On Tue, Jun 24, 2014 at 04:36:47PM +1000, Michael Ellerman wrote:
> > Commit e58e263 "PPC, KVM, CMA: use general CMA reserved area management
> > framework" in next-20140624 removed arch/powerpc/kvm/book3s_hv_cma.c but
> > neglected to update the Makefile, thus breaking the build.
> >
> > Signed-off-by: Michael Ellerman <[email protected]>
> > ---
> >
> > Hi Andrew,
> >
> > This is in your akpm-current and is breaking some of the builds for
> > powerpc in linux-next. Squashing this fix into the original patch would
> > be best for us.
> >
>
> I sent really same patch 10 minutes ago. :)

Haha, oh well, I should have had a coffee instead :)

cheers