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

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

[ARM] 5230/1: Replace post-indexed LDRT/STRT in uaccess.h 



The post-index immediate value is optional if it is 0 and this patch
removes it. The reason is to allow such instructions to compile to
Thumb-2 where only pre-indexed LDRT/STRT instructions are allowed.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9c23e5fe

arch/arm/include/asm/uaccess.h

+5 −5
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ do { \ 


#define __get_user_asm_byte(x,addr,err)				\

	__asm__ __volatile__(					\

	"1:	ldrbt	%1,[%2],#0\n"				\

	"1:	ldrbt	%1,[%2]\n"				\

	"2:\n"							\

	"	.section .fixup,\"ax\"\n"			\

	"	.align	2\n"					\
@@ -261,7 +261,7 @@ do { \ 


#define __get_user_asm_word(x,addr,err)				\

	__asm__ __volatile__(					\

	"1:	ldrt	%1,[%2],#0\n"				\

	"1:	ldrt	%1,[%2]\n"				\

	"2:\n"							\

	"	.section .fixup,\"ax\"\n"			\

	"	.align	2\n"					\
@@ -306,7 +306,7 @@ do { \ 


#define __put_user_asm_byte(x,__pu_addr,err)			\

	__asm__ __volatile__(					\

	"1:	strbt	%1,[%2],#0\n"				\

	"1:	strbt	%1,[%2]\n"				\

	"2:\n"							\

	"	.section .fixup,\"ax\"\n"			\

	"	.align	2\n"					\
@@ -339,7 +339,7 @@ do { \ 


#define __put_user_asm_word(x,__pu_addr,err)			\

	__asm__ __volatile__(					\

	"1:	strt	%1,[%2],#0\n"				\

	"1:	strt	%1,[%2]\n"				\

	"2:\n"							\

	"	.section .fixup,\"ax\"\n"			\

	"	.align	2\n"					\
@@ -365,7 +365,7 @@ do { \ 
#define __put_user_asm_dword(x,__pu_addr,err)			\

	__asm__ __volatile__(					\

	"1:	strt	" __reg_oper1 ", [%1], #4\n"		\

	"2:	strt	" __reg_oper0 ", [%1], #0\n"		\

	"2:	strt	" __reg_oper0 ", [%1]\n"		\

	"3:\n"							\

	"	.section .fixup,\"ax\"\n"			\

	"	.align	2\n"					\