[ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6

[linux-2.6-omap-h63xx.git] / include / asm-arm / vfpmacros.h

diff --git a/include/asm-arm/vfpmacros.h b/include/asm-arm/vfpmacros.h
index 15bd6e74c9cf44ec8c5d256985587f7ea4ad09f5..27fe028b4e72bbd05ff2ec64054e61e1e86a72c9 100644 (file)
--- a/include/asm-arm/vfpmacros.h
+++ b/include/asm-arm/vfpmacros.h
@@ -16,10 +16,18 @@
 
        @ read all the working registers back into the VFP
        .macro  VFPFLDMIA, base
+#if __LINUX_ARM_ARCH__ < 6
        LDC     p11, cr0, [\base],#33*4             @ FLDMIAX \base!, {d0-d15}
+#else
+       LDC     p11, cr0, [\base],#32*4             @ FLDMIAD \base!, {d0-d15}
+#endif
        .endm
 
        @ write all the working registers out of the VFP
        .macro  VFPFSTMIA, base
+#if __LINUX_ARM_ARCH__ < 6
        STC     p11, cr0, [\base],#33*4             @ FSTMIAX \base!, {d0-d15}
+#else
+       STC     p11, cr0, [\base],#32*4             @ FSTMIAD \base!, {d0-d15}
+#endif
        .endm