From f640f38d9b621ba9996980e6942a22f68671e101 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 17 Oct 2012 09:39:08 +0100
Subject: [PATCH] --- yaml --- r: 334782 b: refs/heads/master c:
 7644bdac7f4d3e5910f4d3f86f1f2b098d1212ca h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/xen/xenbus/xenbus_xs.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dc37dee25101..15109111c3ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a5248fe10b101104d92d01438f918e899414fd1
+refs/heads/master: 7644bdac7f4d3e5910f4d3f86f1f2b098d1212ca
diff --git a/trunk/drivers/xen/xenbus/xenbus_xs.c b/trunk/drivers/xen/xenbus/xenbus_xs.c
index f5dda83ad7a5..acedeabe589c 100644
--- a/trunk/drivers/xen/xenbus/xenbus_xs.c
+++ b/trunk/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;
 
 }