Stephen Rothwell
2010-Oct-25 02:30 UTC
[Xen-devel] linux-next: build failure after merge of the xen tree
Hi all, After merging the xen tree, today''s linux-next build (s86_64 allmodconfig) failed like this: arch/x86/xen/setup.c: In function ''xen_memory_setup'': arch/x86/xen/setup.c:161: error: implicit declaration of function ''xen_initial_domain'' Caused by commit 9e9a5fcb04e3af077d1be32710298b852210d93f ("xen: use host E820 map for dom0"). See Rule 1 from Documentation/SubmitChecklist. I have used the xen tree from next-20101021 for today (due to the complex conflict in Friday''s tree). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Campbell
2010-Oct-25 08:38 UTC
[Xen-devel] Re: linux-next: build failure after merge of the xen tree
On Mon, 2010-10-25 at 03:30 +0100, Stephen Rothwell wrote:> Hi all, > > After merging the xen tree, today''s linux-next build (s86_64 allmodconfig) > failed like this: > > arch/x86/xen/setup.c: In function ''xen_memory_setup'': > arch/x86/xen/setup.c:161: error: implicit declaration of function ''xen_initial_domain'' > > Caused by commit 9e9a5fcb04e3af077d1be32710298b852210d93f ("xen: use host > E820 map for dom0"). See Rule 1 from Documentation/SubmitChecklist. > > I have used the xen tree from next-20101021 for today (due to the complex > conflict in Friday''s tree).Sorry about that, there was a missing #include which was hidden for me by a change in the swiotlb-xen tree (d8e0420603cf "xen: define BIOVEC_PHYS_MERGEABLE()", FWIW). We shouldn''t be relying on indirect includes in that way so: 8<----- Subject: xen: include xen/xen.h for definition of xen_initial_domain() CC arch/x86/xen/setup.o arch/x86/xen/setup.c: In function ''xen_memory_setup'': arch/x86/xen/setup.c:161: error: implicit declaration of function ''xen_initial_domain'' Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- arch/x86/xen/setup.c.orig 2010-10-25 09:31:42.000000000 +0100 +++ arch/x86/xen/setup.c 2010-10-25 09:31:49.000000000 +0100 @@ -18,6 +18,7 @@ #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h> +#include <xen/xen.h> #include <xen/page.h> #include <xen/interface/callback.h> #include <xen/interface/memory.h> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jeremy Fitzhardinge
2010-Oct-25 23:57 UTC
[Xen-devel] Re: linux-next: build failure after merge of the xen tree
On 10/25/2010 01:38 AM, Ian Campbell wrote:> On Mon, 2010-10-25 at 03:30 +0100, Stephen Rothwell wrote: >> Hi all, >> >> After merging the xen tree, today''s linux-next build (s86_64 allmodconfig) >> failed like this: >> >> arch/x86/xen/setup.c: In function ''xen_memory_setup'': >> arch/x86/xen/setup.c:161: error: implicit declaration of function ''xen_initial_domain'' >> >> Caused by commit 9e9a5fcb04e3af077d1be32710298b852210d93f ("xen: use host >> E820 map for dom0"). See Rule 1 from Documentation/SubmitChecklist. >> >> I have used the xen tree from next-20101021 for today (due to the complex >> conflict in Friday''s tree). > Sorry about that, there was a missing #include which was hidden for me > by a change in the swiotlb-xen tree (d8e0420603cf "xen: define > BIOVEC_PHYS_MERGEABLE()", FWIW). We shouldn''t be relying on indirect > includes in that way so:Thanks, fixed. J> 8<----- > > Subject: xen: include xen/xen.h for definition of xen_initial_domain() > > CC arch/x86/xen/setup.o > arch/x86/xen/setup.c: In function ''xen_memory_setup'': > arch/x86/xen/setup.c:161: error: implicit declaration of function ''xen_initial_domain'' > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > --- arch/x86/xen/setup.c.orig 2010-10-25 09:31:42.000000000 +0100 > +++ arch/x86/xen/setup.c 2010-10-25 09:31:49.000000000 +0100 > @@ -18,6 +18,7 @@ > #include <asm/xen/hypervisor.h> > #include <asm/xen/hypercall.h> > > +#include <xen/xen.h> > #include <xen/page.h> > #include <xen/interface/callback.h> > #include <xen/interface/memory.h> > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Stephen Rothwell
2010-Oct-27 02:02 UTC
[Xen-devel] linux-next: build failure after merge of the xen tree
Hi all, After merging the xen tree, today''s linux-next build (x86_64 allmodconfig) failed like this: arch/x86/xen/setup.c: In function ''xen_add_extra_mem'': arch/x86/xen/setup.c:65: error: implicit declaration of function ''reserve_early'' Caused by commit 42ee1471e9b879479a15debac752314a596c738e ("xen: implement "extra" memory to reserve space for pages not present at boot") interacting with commit a9ce6bc15100023b411f8117e53a016d61889800 ("x86, memblock: Replace e820_/_early string with memblock_"). This latter commit was in the xen tree yesterday (via a merge of tip/core/memblock) but has been removed today (but it is in Linus'' tree). Linus will need this fixup patch when he merges the xen tree. I have applied it to linux-next today and can carry it as necessary. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 27 Oct 2010 12:57:06 +1100 Subject: [PATCH] xen: merge fixup for reserve_early name change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/x86/xen/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 1163bc5..105db25 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -62,7 +62,7 @@ static __init void xen_add_extra_mem(unsigned long pages) e820_add_region(extra_start, size, E820_RAM); sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); - reserve_early(extra_start, extra_start + size, "XEN EXTRA"); + memblock_x86_reserve_range(extra_start, extra_start + size, "XEN EXTRA"); xen_extra_mem_size += size; -- 1.7.2.3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel