diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-02 05:54:22 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-02 05:54:22 +0300 |
| commit | 2d618bdf71635463a4aa4ad0fe46ec852292bc0c (patch) | |
| tree | f2e3251721b50a73cfe85db41102b5cc75cbeea5 | |
| parent | f2125992e7cb25ece668cb7af2bd8433715827d1 (diff) | |
| parent | 330e261c35dfb969c48f996dbbc8b334b5ee8d9d (diff) | |
| download | linux-2d618bdf71635463a4aa4ad0fe46ec852292bc0c.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull hexagon fixes from Richard Kuo:
"Some small fixes for module compilation"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
hexagon: export csum_partial_copy_nocheck
hexagon: add memset_io() helper
| -rw-r--r-- | arch/hexagon/include/asm/io.h | 6 | ||||
| -rw-r--r-- | arch/hexagon/lib/checksum.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h index 9e8621d94ee9..e17262ad125e 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -216,6 +216,12 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, memcpy((void *) dst, src, count); } +static inline void memset_io(volatile void __iomem *addr, int value, + size_t size) +{ + memset((void __force *)addr, value, size); +} + #define PCI_IO_ADDR (volatile void __iomem *) /* diff --git a/arch/hexagon/lib/checksum.c b/arch/hexagon/lib/checksum.c index 617506d1a559..7cd0a2259269 100644 --- a/arch/hexagon/lib/checksum.c +++ b/arch/hexagon/lib/checksum.c @@ -199,3 +199,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) memcpy(dst, src, len); return csum_partial(dst, len, sum); } +EXPORT_SYMBOL(csum_partial_copy_nocheck); |