summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/copy_from_user.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-09-10 16:44:03 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-09-15 19:51:56 -0400
commit91344493b7da9487a8dbc1109d7486e51c8e5235 (patch)
tree134a2ad5c7ecd0f304fa69118b66acc92544b60c /arch/arm/lib/copy_from_user.S
parent7798bf2140ebcc36eafec6a4194fffd8d585d471 (diff)
downloadtalos-obmc-linux-91344493b7da9487a8dbc1109d7486e51c8e5235.tar.gz
talos-obmc-linux-91344493b7da9487a8dbc1109d7486e51c8e5235.zip
arm: don't zero in __copy_from_user_inatomic()/__copy_from_user()
adjust copy_from_user(), obviously Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/copy_from_user.S')
-rw-r--r--arch/arm/lib/copy_from_user.S9
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
OpenPOWER on IntegriCloud