diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
| commit | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (patch) | |
| tree | c845d5e80991f0eef3a38381036c8261baffb08a /arch/arm64/lib/memset.S | |
| parent | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (diff) | |
| parent | 7b44c3df0b89d05c80e15eb0522a21d033d1314f (diff) | |
Merge branch 'v3.18/topic/KASAN' into linux-linaro-lsk-v3.18lsk-v3.18-16.04
Diffstat (limited to 'arch/arm64/lib/memset.S')
| -rw-r--r-- | arch/arm64/lib/memset.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/lib/memset.S b/arch/arm64/lib/memset.S index 7c72dfd36b63..f2670a9f218c 100644 --- a/arch/arm64/lib/memset.S +++ b/arch/arm64/lib/memset.S @@ -54,6 +54,8 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 + .weak memset +ENTRY(__memset) ENTRY(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 @@ -213,4 +215,5 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -ENDPROC(memset) +ENDPIPROC(memset) +ENDPROC(__memset) |