diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-14 20:42:44 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-14 20:42:44 -0400 |
| commit | 2692a71bbd40160165e89d5505c5c28144ec5a42 (patch) | |
| tree | acaaf0f1a4942486109094acad37c29456aeda98 /arch/arm/lib | |
| parent | 7041c57709efdc1e31aaff663cfe17f0b21f4743 (diff) | |
| parent | b065444286bed7ec49ee81c593a46f3031fbfc83 (diff) | |
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) | |||
| 98 | .pushsection .fixup,"ax" | 98 | .pushsection .fixup,"ax" |
| 99 | .align 0 | 99 | .align 0 |
| 100 | copy_abort_preamble | 100 | copy_abort_preamble |
| 101 | ldmfd sp!, {r1, r2} | 101 | ldmfd sp!, {r1, r2, r3} |
| 102 | sub r3, r0, r1 | 102 | sub r0, r0, r1 |
| 103 | rsb r1, r3, r2 | 103 | rsb r0, r0, r2 |
| 104 | str r1, [sp] | ||
| 105 | bl __memzero | ||
| 106 | ldr r0, [sp], #4 | ||
| 107 | copy_abort_end | 104 | copy_abort_end |
| 108 | .popsection | 105 | .popsection |
| 109 | 106 | ||