diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-09-15 11:17:04 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-09-15 11:17:04 -0400 |
| commit | 0fab59e5ddb4e0557825e9ab8e41b66b5f336941 (patch) | |
| tree | 71daceee4745b3607d7a6504e667402286c06fa7 /arch/tile | |
| parent | a802fc685426303ab627b7ad3fd5c97b5dea7e00 (diff) | |
| download | kernel_samsung_aries-0fab59e5ddb4e0557825e9ab8e41b66b5f336941.zip kernel_samsung_aries-0fab59e5ddb4e0557825e9ab8e41b66b5f336941.tar.gz kernel_samsung_aries-0fab59e5ddb4e0557825e9ab8e41b66b5f336941.tar.bz2 | |
arch/tile: fix memcpy_fromio()/memcpy_toio() signatures
This tripped up a driver (not yet committed to git). Fix it now.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/include/asm/io.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h index 8c95bef..ee43328 100644 --- a/arch/tile/include/asm/io.h +++ b/arch/tile/include/asm/io.h @@ -164,22 +164,22 @@ static inline void _tile_writeq(u64 val, unsigned long addr) #define iowrite32 writel #define iowrite64 writeq -static inline void *memcpy_fromio(void *dst, void *src, int len) +static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, + size_t len) { int x; BUG_ON((unsigned long)src & 0x3); for (x = 0; x < len; x += 4) *(u32 *)(dst + x) = readl(src + x); - return dst; } -static inline void *memcpy_toio(void *dst, void *src, int len) +static inline void memcpy_toio(volatile void __iomem *dst, const void *src, + size_t len) { int x; BUG_ON((unsigned long)dst & 0x3); for (x = 0; x < len; x += 4) writel(*(u32 *)(src + x), dst + x); - return dst; } /* |