diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
commit | 09cc926e9a6002790e69ed213217ef9874888624 (patch) | |
tree | d97960db291ce620a9ee216b4d3cafd6f38ee2d3 /arch/arm64/lib/clear_user.S | |
parent | d18b9ba808322f843375c262a7df889ff406a71c (diff) | |
parent | 252f23ea5987a4730e3399ef1ad5d78efcc786c9 (diff) |
Merge tag 'v3.10.61' into linux-linaro-lsk
This is the 3.10.61 stable release
Diffstat (limited to 'arch/arm64/lib/clear_user.S')
-rw-r--r-- | arch/arm64/lib/clear_user.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S index 6e0ed93d51fe..c17967fdf5f6 100644 --- a/arch/arm64/lib/clear_user.S +++ b/arch/arm64/lib/clear_user.S @@ -46,7 +46,7 @@ USER(9f, strh wzr, [x0], #2 ) sub x1, x1, #2 4: adds x1, x1, #1 b.mi 5f - strb wzr, [x0] +USER(9f, strb wzr, [x0] ) 5: mov x0, #0 ret ENDPROC(__clear_user) |