diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-11 19:55:45 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-11 19:55:45 +0100 |
commit | 1c8d29696f0d79902962526d6c54ebfeb842c61d (patch) | |
tree | 047caddef4ee91e42002bc1234d273c6fbc54967 /arch/m32r/include/asm/io.h | |
parent | ARM: sa11x0: Use void __iomem * in MMIO accessors (diff) | |
parent | documentation: memory-barriers: clarify relaxed io accessor semantics (diff) | |
download | linux-1c8d29696f0d79902962526d6c54ebfeb842c61d.tar.xz linux-1c8d29696f0d79902962526d6c54ebfeb842c61d.zip |
Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic
* 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
documentation: memory-barriers: clarify relaxed io accessor semantics
x86: io: implement dummy relaxed accessor macros for writes
tile: io: implement dummy relaxed accessor macros for writes
sparc: io: implement dummy relaxed accessor macros for writes
powerpc: io: implement dummy relaxed accessor macros for writes
parisc: io: implement dummy relaxed accessor macros for writes
mn10300: io: implement dummy relaxed accessor macros for writes
m68k: io: implement dummy relaxed accessor macros for writes
m32r: io: implement dummy relaxed accessor macros for writes
ia64: io: implement dummy relaxed accessor macros for writes
cris: io: implement dummy relaxed accessor macros for writes
frv: io: implement dummy relaxed accessor macros for writes
xtensa: io: remove dummy relaxed accessor macros for reads
s390: io: remove dummy relaxed accessor macros for reads
microblaze: io: remove dummy relaxed accessor macros
asm-generic: io: implement relaxed accessor macros as conditional wrappers
Conflicts:
include/asm-generic/io.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m32r/include/asm/io.h')
-rw-r--r-- | arch/m32r/include/asm/io.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h index 4010f1fc5b65..6e7787f3dac7 100644 --- a/arch/m32r/include/asm/io.h +++ b/arch/m32r/include/asm/io.h @@ -161,6 +161,9 @@ static inline void _writel(unsigned long l, unsigned long addr) #define __raw_writeb writeb #define __raw_writew writew #define __raw_writel writel +#define writeb_relaxed writeb +#define writew_relaxed writew +#define writel_relaxed writel #define ioread8 read #define ioread16 readw |