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/arm64/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/arm64/lib')
| -rw-r--r-- | arch/arm64/lib/copy_from_user.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S index 0b90497d4424..4fd67ea03bb0 100644 --- a/arch/arm64/lib/copy_from_user.S +++ b/arch/arm64/lib/copy_from_user.S @@ -79,11 +79,6 @@ ENDPROC(__arch_copy_from_user) .section .fixup,"ax" .align 2 -9998: - sub x0, end, dst -9999: - strb wzr, [dst], #1 // zero remaining buffer space - cmp dst, end - b.lo 9999b +9998: sub x0, end, dst // bytes not copied ret .previous |