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

Patch from Catalin Marinas

The X variants are deprecated starting with ARMv6. Using the D variants,
the fpmx_state in vfp_hard_struct is no longer needed.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h
index 6246bf83627d3c7c5304cdc47d974daec61f8702..52bae088a185c04fb95186acde501e53e92e1817 100644 (file)
--- a/include/asm-arm/fpstate.h
+++ b/include/asm-arm/fpstate.h
@@ -26,7 +26,9 @@
 
 struct vfp_hard_struct {
        __u64 fpregs[16];
+#if __LINUX_ARM_ARCH__ < 6
        __u32 fpmx_state;
+#endif
        __u32 fpexc;
        __u32 fpscr;
        /*

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