From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754037Ab0JYIsH (ORCPT ); Mon, 25 Oct 2010 04:48:07 -0400 Received: from smtp.citrix.com ([66.165.176.89]:11729 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434Ab0JYIsF (ORCPT ); Mon, 25 Oct 2010 04:48:05 -0400 X-Greylist: delayed 574 seconds by postgrey-1.27 at vger.kernel.org; Mon, 25 Oct 2010 04:48:04 EDT X-IronPort-AV: E=Sophos;i="4.58,235,1286164800"; d="scan'208";a="10788485" Subject: Re: linux-next: build failure after merge of the xen tree From: Ian Campbell To: Stephen Rothwell CC: Jeremy Fitzhardinge , Xen Devel , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stefano Stabellini , Konrad Rzeszutek Wilk In-Reply-To: <20101025133021.53649fd1.sfr@canb.auug.org.au> References: <20101025133021.53649fd1.sfr@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" Organization: Citrix Systems, Inc. Date: Mon, 25 Oct 2010 09:38:26 +0100 Message-ID: <1287995906.11851.14219.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 #include +#include #include #include #include