From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de (Re: [IA64] Weekly benchmark results [2010ww36]) Date: Mon, 13 Sep 2010 09:38:50 +0100 Message-ID: <4C8DFF3A0200007800015A0F@vpn.id2.novell.com> References: <20100910.171901.473825099.kuwa@jp.fujitsu.com> <19594.28699.580800.264948@mariner.uk.xensource.com> <20100913.170710.356441561.kuwa@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20100913.170710.356441561.kuwa@jp.fujitsu.com> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: KUWAMURA Shin'ya Cc: xen-devel@lists.xensource.com, Ian.Jackson@eu.citrix.com, xen-ia64-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org >>> On 13.09.10 at 10:07, "KUWAMURA Shin'ya" wrote: > Hi Ian, >=20 >>>>>> On Fri, 10 Sep 2010 18:51:23 +0100 >>>>>> Ian.Jackson@eu.citrix.com(Ian Jackson) said: >>=20 >> KUWAMURA Shin'ya writes ("[Xen-devel] [IA64] Weekly benchmark results=20= > [2010ww36]"): >> > - Linux-2.6.18-xen cannot be built: >> > In file included from=20 > /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:27: >> > /linux-2.6.18-xen.hg/include/xen/interface/domctl.h:284: error: = field=20 > `cpumap' has incomplete type >> > This issue was fixed ad hoc. >>=20 >> If you'd like to send the ad-hoc fixes you used, that would be very >> helpful. If they're suitable for inclusion we'll commit them, and if >> not they'll be good explanations of the bugs. >=20 > Thank you for your advice. > I attached the patch. The cause is as follows: >=20 > 1028:6f7bda25a4de includes xen-unstable 21568:05bfc5a472b which > moved struct xenctl_cpumap from domctl.h to xen.h. > However, xcom_privcmd.c includes xen.h without __XEN__ or > __XEN_TOOLS__, so struct xenctl_cpumap is invisible from > xcom_privcmd.c. >=20 > This patch fixes by defining __XEN_TOOLS__ at the top of xcom_privcmd.c. > But this causes a warning: >=20 > In file included from /linux-2.6.18-xen.hg/include/xen/interface/xen.h:30= , > from=20 > /linux-2.6.18-xen.hg/include/xen/interface/arch-ia64.h:26, > from include2/asm/xen/privop.h:16, > from include2/asm/privop.h:14, > from include2/asm/intrinsics.h:189, > from include2/asm/bitops.h:14, > from /linux-2.6.18-xen.hg/include/linux/bitops.h:9, > from /linux-2.6.18-xen.hg/include/linux/kernel.h:15, > from /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:2= 2: > /linux-2.6.18-xen.hg/include/xen/interface/xen-compat.h:34:1: warning:=20= > "__XEN_INTERFACE_VERSION__" redefined > :5:1: warning: this is the location of the previous = definition This doesn't seem to be the right (or a sufficient) fix then. Even more, a few lines down in the same source file __XEN__ already gets #define-d, so the first choice imo would be to simply move that definition up. Or does this cause any *more* problems than the warning above (which I think needs to be dealt with regardless)? Jan