projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
arch
/
arm
/
lib
/
copy_from_user.S
diff --git
a/arch/arm/lib/copy_from_user.S
b/arch/arm/lib/copy_from_user.S
index
f549c57
..
63e4c1e
100644
(file)
--- a/
arch/arm/lib/copy_from_user.S
+++ b/
arch/arm/lib/copy_from_user.S
@@
-100,12
+100,9
@@
EXPORT_SYMBOL(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