diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-11 21:55:45 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-11 21:55:45 +0300 |
| commit | 1c8d29696f0d79902962526d6c54ebfeb842c61d (patch) | |
| tree | 047caddef4ee91e42002bc1234d273c6fbc54967 /arch/s390 | |
| parent | 3ba5acf368ae415cd14d026b7cfe29de942b65fc (diff) | |
| parent | a8e0aead70b4af957e6b27b82fba849c6179b707 (diff) | |
| download | linux-1c8d29696f0d79902962526d6c54ebfeb842c61d.tar.xz | |
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/s390')
| -rw-r--r-- | arch/s390/include/asm/io.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index d22c2eeae78f..6ad9013c67e7 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h @@ -61,11 +61,6 @@ static inline void iounmap(volatile void __iomem *addr) #define __raw_writel zpci_write_u32 #define __raw_writeq zpci_write_u64 -#define readb_relaxed readb -#define readw_relaxed readw -#define readl_relaxed readl -#define readq_relaxed readq - #endif /* CONFIG_PCI */ #include <asm-generic/io.h> |