Re: linux-next: build failure after merge of the xen-two tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2086 bytes --]

Hi Konrad,

On Tue, 5 Feb 2013 13:30:08 -0500 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote:
>
> On Mon, Feb 04, 2013 at 03:14:56PM +1100, Stephen Rothwell wrote:
> > 
> > After merging the xen-two tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > arch/x86/xen/mmu.c: In function 'xen_init_mmu_ops':
> > arch/x86/xen/mmu.c:2213:10: error: 'struct x86_init_ops' has no member named 'mapping'
> > arch/x86/xen/mmu.c:2213:39: error: 'xen_mapping_pagetable_reserve' undeclared (first use in this function)
> > 
> > Caused by commit 8154d7a6b9b9 ("xen/pvh: Implement MMU changes for PVH")
> > from the xen-two tree interacting with commit 6f80b68e9e51 ("x86, mm,
> > Xen: Remove mapping_pagetable_reserve()") from the tip tree.  The
> > automatic merge left the moved version of the above line intact while it
> > should have been removed (I assume).
> > 
> > I have added the following merge fix patch and can carry the fix as
> > necessary.
> 
> Ah yes. Please do. I will fix it up once I am back on the box that has
> access to the kernel.org. Thanks again!
> 
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 4 Feb 2013 15:08:33 +1100
> > Subject: [PATCH] xen: fix bad merge of arch/x86/xen/mmu.c
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  arch/x86/xen/mmu.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
> > index 824706a..3228600 100644
> > --- a/arch/x86/xen/mmu.c
> > +++ b/arch/x86/xen/mmu.c
> > @@ -2210,7 +2210,6 @@ void __init xen_init_mmu_ops(void)
> >  		pv_mmu_ops.flush_tlb_others = xen_flush_tlb_others;
> >  		return;
> >  	}
> > -	x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve;
> >  	pv_mmu_ops = xen_mmu_ops;
> >  
> >  	memset(dummy_mapping, 0xff, PAGE_SIZE);

I am still carrying this merge fix patch and from a quick look, your tree
should need it now to even build ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]