diff options
author | 2020-01-31 11:23:29 -0800 | |
---|---|---|
committer | 2020-01-31 11:23:29 -0800 | |
commit | a1084542a8e83b8eb5aaf7e8ccb81b461e7d4ce8 (patch) | |
tree | f5960f2ba6c6a38423492a73c81ec06e4a0575d2 /mm/kasan | |
parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | riscv: dts: Add DT support for SiFive FU540 GPIO driver (diff) | |
download | linux-a1084542a8e83b8eb5aaf7e8ccb81b461e7d4ce8.tar.gz linux-a1084542a8e83b8eb5aaf7e8ccb81b461e7d4ce8.tar.bz2 linux-a1084542a8e83b8eb5aaf7e8ccb81b461e7d4ce8.zip |
Merge tag 'riscv-for-linus-5.6-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V updates from Palmer Dabbelt:
"This contains a handful of patches for this merge window:
- Support for kasan
- 32-bit physical addresses on rv32i-based systems
- Support for CONFIG_DEBUG_VIRTUAL
- DT entry for the FU540 GPIO controller, which has recently had a
device driver merged
These boot a buildroot-based system on QEMU's virt board for me"
* tag 'riscv-for-linus-5.6-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: dts: Add DT support for SiFive FU540 GPIO driver
riscv: mm: add support for CONFIG_DEBUG_VIRTUAL
riscv: keep 32-bit kernel to 32-bit phys_addr_t
kasan: Add riscv to KASAN documentation.
riscv: Add KASAN support
kasan: No KASAN's memmove check if archs don't have it.
Diffstat (limited to 'mm/kasan')
-rw-r--r-- | mm/kasan/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/kasan/common.c b/mm/kasan/common.c index c15d8ae68c96..6aa51723b92b 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -110,6 +110,7 @@ void *memset(void *addr, int c, size_t len) return __memset(addr, c, len); } +#ifdef __HAVE_ARCH_MEMMOVE #undef memmove void *memmove(void *dest, const void *src, size_t len) { @@ -118,6 +119,7 @@ void *memmove(void *dest, const void *src, size_t len) return __memmove(dest, src, len); } +#endif #undef memcpy void *memcpy(void *dest, const void *src, size_t len) |