diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2013-02-01 15:21:41 -0500 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2013-02-08 13:20:40 -0500 |
| commit | f456da5e1305672c86e2cbe07483388a75a9bb2e (patch) | |
| tree | 35d884bfc8353fc4e87871a5d5b4598ae8ea8d7f /arch | |
| parent | 7c63e1ee0afe0e957292463cfa111ba59193ab2f (diff) | |
| download | blackbird-op-linux-f456da5e1305672c86e2cbe07483388a75a9bb2e.tar.gz blackbird-op-linux-f456da5e1305672c86e2cbe07483388a75a9bb2e.zip | |
tile: fix memcpy_*io functions for allnoconfig
On tilepro without CONFIG_PCI, we can't provide inlines of these
functions, as we don't have readl/writel.
In addition, fix memset_io() signature to take a volatile void *.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/include/asm/io.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h index 2a9b293fece6..31672918064c 100644 --- a/arch/tile/include/asm/io.h +++ b/arch/tile/include/asm/io.h @@ -250,7 +250,9 @@ static inline void writeq(u64 val, unsigned long addr) #define iowrite32 writel #define iowrite64 writeq -static inline void memset_io(void *dst, int val, size_t len) +#if CHIP_HAS_MMIO() || defined(CONFIG_PCI) + +static inline void memset_io(volatile void *dst, int val, size_t len) { int x; BUG_ON((unsigned long)dst & 0x3); @@ -277,6 +279,8 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, writel(*(u32 *)(src + x), dst + x); } +#endif + /* * The Tile architecture does not support IOPORT, even with PCI. * Unfortunately we can't yet simply not declare these methods, |
