summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-10-17 09:39:08 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-10-19 15:17:48 -0400
commit7644bdac7f4d3e5910f4d3f86f1f2b098d1212ca (patch)
tree697a7502ddf10f1f88b2644dde9d63436ca1a34b
parent8a5248fe10b101104d92d01438f918e899414fd1 (diff)
downloadtalos-op-linux-7644bdac7f4d3e5910f4d3f86f1f2b098d1212ca.tar.gz
talos-op-linux-7644bdac7f4d3e5910f4d3f86f1f2b098d1212ca.zip
xen: xenbus: quirk uses x86 specific cpuid
This breaks on ARM. This quirk is not necessary on ARM because no hypervisors of that vintage exist for that architecture (port is too new). Signed-off-by: Ian Campbell <ian.campbell@citrix.com> [v1: Moved the ifdef inside the function per Jan Beulich suggestion] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/xenbus/xenbus_xs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index f5dda83ad7a5..acedeabe589c 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -627,6 +627,7 @@ static struct xenbus_watch *find_watch(const char *token)
*/
static bool xen_strict_xenbus_quirk(void)
{
+#ifdef CONFIG_X86
uint32_t eax, ebx, ecx, edx, base;
base = xen_cpuid_base();
@@ -634,6 +635,7 @@ static bool xen_strict_xenbus_quirk(void)
if ((eax >> 16) < 4)
return true;
+#endif
return false;
}
OpenPOWER on IntegriCloud