diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-15 02:42:44 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-15 02:42:44 +0200 |
| commit | 2692a71bbd40160165e89d5505c5c28144ec5a42 (patch) | |
| tree | acaaf0f1a4942486109094acad37c29456aeda98 /arch/arm/lib | |
| parent | score: traps: Add missing include file to fix build error (diff) | |
| parent | blackfin: no access_ok() for __copy_{to,from}_user() (diff) | |
| download | linux-2692a71bbd40160165e89d5505c5c28144ec5a42.tar.xz linux-2692a71bbd40160165e89d5505c5c28144ec5a42.zip | |
Merge branch 'work.uaccess' into for-linus
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/copy_from_user.S | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S index 1512bebfbf1b..7a4b06049001 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S @@ -98,12 +98,9 @@ ENDPROC(arm_copy_from_user) .pushsection .fixup,"ax" .align 0 copy_abort_preamble - ldmfd sp!, {r1, r2} - sub r3, r0, r1 - rsb r1, r3, r2 - str r1, [sp] - bl __memzero - ldr r0, [sp], #4 + ldmfd sp!, {r1, r2, r3} + sub r0, r0, r1 + rsb r0, r0, r2 copy_abort_end .popsection |