Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753887Ab2JOQVU (ORCPT ); Mon, 15 Oct 2012 12:21:20 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:37899 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753274Ab2JOQVS (ORCPT ); Mon, 15 Oct 2012 12:21:18 -0400 Date: Mon, 15 Oct 2012 12:09:12 -0400 From: Konrad Rzeszutek Wilk To: Ian Campbell Cc: Olaf Hering , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/3] xen/pv-on-hvm kexec: add quirk for Xen 3.4 and shutdown watches. Message-ID: <20121015160912.GA26765@phenom.dumpdata.com> References: <1349890849-17471-1-git-send-email-konrad.wilk@oracle.com> <1349890849-17471-2-git-send-email-konrad.wilk@oracle.com> <1350317146.18058.83.camel@zakaz.uk.xensource.com> <1350317658.18058.84.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1350317658.18058.84.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1945 Lines: 64 On Mon, Oct 15, 2012 at 05:14:18PM +0100, Ian Campbell wrote: > On Mon, 2012-10-15 at 17:05 +0100, Ian Campbell wrote: > > > > > +static bool xen_strict_xenbus_quirk() > > > +{ > > > + uint32_t eax, ebx, ecx, edx, base; > > > + > > > + base = xen_cpuid_base(); > > > + cpuid(base + 1, &eax, &ebx, &ecx, &edx); > > > > This breaks on ARM because this is an x86 specific function. Can we > > ifdef it or properly wrap it in an arch interface please. > > Quick-n-dirty fix. applied. Thx > > 8<---------------------------- > > >From fe19515d8f7bed49c4474f475e6a8cbbdc5eb3f2 Mon Sep 17 00:00:00 2001 > From: Ian Campbell > Date: Mon, 15 Oct 2012 17:06:47 +0100 > Subject: [PATCH] xen: fix build on ARM > > xen_strict_xenbus_quirk is x86 specific. > > Signed-off-by: Ian Campbell > --- > drivers/xen/xenbus/xenbus_xs.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c > index 48220e1..b46ad11 100644 > --- a/drivers/xen/xenbus/xenbus_xs.c > +++ b/drivers/xen/xenbus/xenbus_xs.c > @@ -619,6 +619,8 @@ static struct xenbus_watch *find_watch(const char *token) > > return NULL; > } > + > +#ifdef CONFIG_X86 > /* > * Certain older XenBus toolstack cannot handle reading values that are > * not populated. Some Xen 3.4 installation are incapable of doing this > @@ -637,6 +639,10 @@ static bool xen_strict_xenbus_quirk() > return false; > > } > +#else > +static bool xen_strict_xenbus_quirk(void) { return false; } > +#endif > + > static void xs_reset_watches(void) > { > int err, supported = 0; > -- > 1.7.2.5 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/