Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb54a335 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1320a80d

include/asm-arm/fpstate.h

+2 −0
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 


struct vfp_hard_struct {

	__u64 fpregs[16];

#if __LINUX_ARM_ARCH__ < 6

	__u32 fpmx_state;

#endif

	__u32 fpexc;

	__u32 fpscr;

	/*

include/asm-arm/vfpmacros.h

+8 −0
Original line number Diff line number Diff line
@@ -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