From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 22 Feb 2013 08:58:20 +0000 (+0000)
Subject: xen: arm: Enable VFP is a nop on 64-bit.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7185
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2676f564d3aafb1856ac264cc5a7e5a1b255e70b;p=xen.git

xen: arm: Enable VFP is a nop on 64-bit.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/include/asm-arm/vfp.h b/xen/include/asm-arm/vfp.h
index 9477916a53..b800816f2d 100644
--- a/xen/include/asm-arm/vfp.h
+++ b/xen/include/asm-arm/vfp.h
@@ -3,6 +3,9 @@
 
 #include <xen/types.h>
 
+
+#ifdef CONFIG_ARM_32
+
 #define FPEXC_EN (1u << 30)
 
 /* Save and restore FP state.
@@ -17,12 +20,17 @@
     asm volatile ("fmxr fp" #reg ", %0" : : "r" (val)); \
 } while (0)
 
-
 /* Start-of-day: Turn on VFP */
 static inline void enable_vfp(void)
 {
     WRITE_FP(exc, READ_FP(exc) | FPEXC_EN);
 }
+#else
+static inline void enable_vfp(void)
+{
+    /* Always enable on 64-bit */
+}
+#endif
 
 #endif
 /*