From 8dab359849718671be53a0c83b416faefef2913b Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Fri, 1 Feb 2013 15:21:41 -0500 Subject: [PATCH] --- yaml --- r: 349717 b: refs/heads/master c: f456da5e1305672c86e2cbe07483388a75a9bb2e h: refs/heads/master i: 349715: 06a83855e7e53d81db553e4731eef3c950b0f679 v: v3 --- [refs] | 2 +- trunk/arch/tile/include/asm/io.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a25d24e4a53a..82bb74e0b642 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c63e1ee0afe0e957292463cfa111ba59193ab2f +refs/heads/master: f456da5e1305672c86e2cbe07483388a75a9bb2e diff --git a/trunk/arch/tile/include/asm/io.h b/trunk/arch/tile/include/asm/io.h index 2a9b293fece6..31672918064c 100644 --- a/trunk/arch/tile/include/asm/io.h +++ b/trunk/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,