diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2020-11-17 15:20:26 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-11-17 15:20:26 -0400 |
| commit | bf3b7b7ba9e3db55d164ec7bf05e6947f79637cd (patch) | |
| tree | 7de81ebc8339c2a985b2af0e360368e281564c93 /arch/arm64/lib/memmove.S | |
| parent | 8a7904a672a1d33c848e5129f886ee69e0773a2e (diff) | |
| parent | dabbd6abcdbeb1358a53ec28a244429320eb0e3a (diff) | |
| download | linux-bf3b7b7ba9e3db55d164ec7bf05e6947f79637cd.tar.bz2 | |
Merge branch 'for-rc' into rdma.git
From https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
The rc RDMA branch is needed due to dependencies on the next patches.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'arch/arm64/lib/memmove.S')
| -rw-r--r-- | arch/arm64/lib/memmove.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/lib/memmove.S b/arch/arm64/lib/memmove.S index 02cda2e33bde..1035dce4bdaf 100644 --- a/arch/arm64/lib/memmove.S +++ b/arch/arm64/lib/memmove.S @@ -45,9 +45,8 @@ C_h .req x12 D_l .req x13 D_h .req x14 - .weak memmove SYM_FUNC_START_ALIAS(__memmove) -SYM_FUNC_START_PI(memmove) +SYM_FUNC_START_WEAK_PI(memmove) cmp dstin, src b.lo __memcpy add tmp1, src, count |