[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1287995906.11851.14219.camel@zakaz.uk.xensource.com>
Date: Mon, 25 Oct 2010 09:38:26 +0100
From: Ian Campbell <Ian.Campbell@...citrix.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: Jeremy Fitzhardinge <jeremy@...p.org>,
Xen Devel <Xen-devel@...ts.xensource.com>,
"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Stefano Stabellini <Stefano.Stabellini@...citrix.com>,
Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: 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@...rix.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>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists