|   | 
      | 
  
  
      | 
      | 
  
 
     | 
    | 
  
  
     | 
    | 
  
  
    |   | 
      | 
  
  
    | 
         
xen-devel
[Xen-devel] Re: linux-next: build failure after merge of the xen	tree
 
| 
To:  | 
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> | 
 
| 
Subject:  | 
[Xen-devel] Re: linux-next: build failure after merge of the xen	tree | 
 
| 
From:  | 
Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx> | 
 
| 
Date:  | 
Mon, 25 Oct 2010 09:38:26 +0100 | 
 
| 
Cc:  | 
Jeremy Fitzhardinge <jeremy@xxxxxxxx>,	Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>,	Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>,	Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>,	"linux-kernel@xxxxxxxxxxxxxxx" <linux-kernel@xxxxxxxxxxxxxxx>,	"linux-next@xxxxxxxxxxxxxxx" <linux-next@xxxxxxxxxxxxxxx> | 
 
| 
Delivery-date:  | 
Mon, 25 Oct 2010 01:39:18 -0700 | 
 
| 
Envelope-to:  | 
www-data@xxxxxxxxxxxxxxxxxxx | 
 
| 
In-reply-to:  | 
<20101025133021.53649fd1.sfr@xxxxxxxxxxxxxxxx> | 
 
| 
List-help:  | 
<mailto:xen-devel-request@lists.xensource.com?subject=help> | 
 
| 
List-id:  | 
Xen developer discussion <xen-devel.lists.xensource.com> | 
 
| 
List-post:  | 
<mailto:xen-devel@lists.xensource.com> | 
 
| 
List-subscribe:  | 
<http://lists.xensource.com/mailman/listinfo/xen-devel>,	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe> | 
 
| 
List-unsubscribe:  | 
<http://lists.xensource.com/mailman/listinfo/xen-devel>,	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> | 
 
| 
Organization:  | 
Citrix Systems, Inc. | 
 
| 
References:  | 
<20101025133021.53649fd1.sfr@xxxxxxxxxxxxxxxx> | 
 
| 
Sender:  | 
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx | 
 
 
 
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@xxxxxxxxxx>
--- 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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
 |   
 
 | 
    | 
  
  
    |   | 
    |