diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2008-08-29 13:31:15 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-01 07:06:35 -0400 |
| commit | 4e6a0c397f40c9d98062aaaac66cab684f0b9186 (patch) | |
| tree | d0493ef17bf1ff1dc08b6a06fc92f3878011d714 /arch | |
| parent | 9c23e5fefaaecd494925258084a31c8ff301ad03 (diff) | |
[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: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/uaccess.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index d0f51ff900b..e98ec60b340 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h | |||
| @@ -225,7 +225,7 @@ do { \ | |||
| 225 | 225 | ||
| 226 | #define __get_user_asm_byte(x,addr,err) \ | 226 | #define __get_user_asm_byte(x,addr,err) \ |
| 227 | __asm__ __volatile__( \ | 227 | __asm__ __volatile__( \ |
| 228 | "1: ldrbt %1,[%2],#0\n" \ | 228 | "1: ldrbt %1,[%2]\n" \ |
| 229 | "2:\n" \ | 229 | "2:\n" \ |
| 230 | " .section .fixup,\"ax\"\n" \ | 230 | " .section .fixup,\"ax\"\n" \ |
| 231 | " .align 2\n" \ | 231 | " .align 2\n" \ |
| @@ -261,7 +261,7 @@ do { \ | |||
| 261 | 261 | ||
| 262 | #define __get_user_asm_word(x,addr,err) \ | 262 | #define __get_user_asm_word(x,addr,err) \ |
| 263 | __asm__ __volatile__( \ | 263 | __asm__ __volatile__( \ |
| 264 | "1: ldrt %1,[%2],#0\n" \ | 264 | "1: ldrt %1,[%2]\n" \ |
| 265 | "2:\n" \ | 265 | "2:\n" \ |
| 266 | " .section .fixup,\"ax\"\n" \ | 266 | " .section .fixup,\"ax\"\n" \ |
| 267 | " .align 2\n" \ | 267 | " .align 2\n" \ |
| @@ -306,7 +306,7 @@ do { \ | |||
| 306 | 306 | ||
| 307 | #define __put_user_asm_byte(x,__pu_addr,err) \ | 307 | #define __put_user_asm_byte(x,__pu_addr,err) \ |
| 308 | __asm__ __volatile__( \ | 308 | __asm__ __volatile__( \ |
| 309 | "1: strbt %1,[%2],#0\n" \ | 309 | "1: strbt %1,[%2]\n" \ |
| 310 | "2:\n" \ | 310 | "2:\n" \ |
| 311 | " .section .fixup,\"ax\"\n" \ | 311 | " .section .fixup,\"ax\"\n" \ |
| 312 | " .align 2\n" \ | 312 | " .align 2\n" \ |
| @@ -339,7 +339,7 @@ do { \ | |||
| 339 | 339 | ||
| 340 | #define __put_user_asm_word(x,__pu_addr,err) \ | 340 | #define __put_user_asm_word(x,__pu_addr,err) \ |
| 341 | __asm__ __volatile__( \ | 341 | __asm__ __volatile__( \ |
| 342 | "1: strt %1,[%2],#0\n" \ | 342 | "1: strt %1,[%2]\n" \ |
| 343 | "2:\n" \ | 343 | "2:\n" \ |
| 344 | " .section .fixup,\"ax\"\n" \ | 344 | " .section .fixup,\"ax\"\n" \ |
| 345 | " .align 2\n" \ | 345 | " .align 2\n" \ |
| @@ -365,7 +365,7 @@ do { \ | |||
| 365 | #define __put_user_asm_dword(x,__pu_addr,err) \ | 365 | #define __put_user_asm_dword(x,__pu_addr,err) \ |
| 366 | __asm__ __volatile__( \ | 366 | __asm__ __volatile__( \ |
| 367 | "1: strt " __reg_oper1 ", [%1], #4\n" \ | 367 | "1: strt " __reg_oper1 ", [%1], #4\n" \ |
| 368 | "2: strt " __reg_oper0 ", [%1], #0\n" \ | 368 | "2: strt " __reg_oper0 ", [%1]\n" \ |
| 369 | "3:\n" \ | 369 | "3:\n" \ |
| 370 | " .section .fixup,\"ax\"\n" \ | 370 | " .section .fixup,\"ax\"\n" \ |
| 371 | " .align 2\n" \ | 371 | " .align 2\n" \ |