xnu-4903.241.1.tar.gz

[apple/xnu.git] / osfmk / arm / machine_cpuid.c

diff --git a/osfmk/arm/machine_cpuid.c b/osfmk/arm/machine_cpuid.c
index 232c6e64a39d7a2f96858150c439ab7a779a02e4..ac54a0be51896b4a024f904322b0d0edad1fae24 100644 (file)
--- a/osfmk/arm/machine_cpuid.c
+++ b/osfmk/arm/machine_cpuid.c
@@ -135,24 +135,20 @@ machine_arm_debug_info(void)
 void
 machine_do_mvfpid()
 {
+#if __arm__
        arm_mvfr0_info_t        arm_mvfr0_info;
        arm_mvfr1_info_t        arm_mvfr1_info;
-       uint64_t                tmp;
 
-#if __arm__
-       (void)tmp;
        __asm__ volatile("vmrs  %0, mvfr0":"=r"(arm_mvfr0_info.value));
        __asm__ volatile("vmrs  %0, mvfr1":"=r"(arm_mvfr1_info.value));
-#else
-       __asm__ volatile("mrs   %0, MVFR0_EL1":"=r"(tmp));
-       arm_mvfr0_info.value = (uint32_t)tmp;
-
-       __asm__ volatile("mrs   %0, MVFR1_EL1":"=r"(tmp));
-       arm_mvfr1_info.value = (uint32_t)tmp;
-#endif
 
        cpuid_mvfp_info.neon = arm_mvfr1_info.bits.SP;
        cpuid_mvfp_info.neon_hpfp = arm_mvfr1_info.bits.HPFP;
+#else
+       cpuid_mvfp_info.neon = 1;
+       cpuid_mvfp_info.neon_hpfp = 1;
+#endif /* __arm__ */
+
 }
 
 arm_mvfp_info_t *