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.
8<----------------------------
>From fe19515d8f7bed49c4474f475e6a8cbbdc5eb3f2 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campb...@citrix.com>
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 <ian.campb...@citrix.com>
---
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
