Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic asm/io.h rewrite from Arnd Bergmann: "While there normally is no reason to have a pull request for asm-generic but have all changes get merged through whichever tree needs them, I do have a series for 3.19. There are two sets of patches that change significant portions of asm/io.h, and this branch contains both in order to resolve the conflicts: - Will Deacon has done a set of patches to ensure that all architectures define {read,write}{b,w,l,q}_relaxed() functions or get them by including asm-generic/io.h. These functions are commonly used on ARM specific drivers to avoid expensive L2 cache synchronization implied by the normal {read,write}{b,w,l,q}, but we need to define them on all architectures in order to share the drivers across architectures and to enable CONFIG_COMPILE_TEST configurations for them - Thierry Reding has done an unrelated set of patches that extends the asm-generic/io.h file to the degree necessary to make it useful on ARM64 and potentially other architectures" * tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (29 commits) ARM64: use GENERIC_PCI_IOMAP sparc: io: remove duplicate relaxed accessors on sparc32 ARM: sa11x0: Use void __iomem * in MMIO accessors arm64: Use include/asm-generic/io.h ARM: Use include/asm-generic/io.h asm-generic/io.h: Implement generic {read,write}s*() asm-generic/io.h: Reconcile I/O accessor overrides /dev/mem: Use more consistent data types Change xlate_dev_{kmem,mem}_ptr() prototypes ARM: ixp4xx: Properly override I/O accessors ARM: ixp4xx: Fix build with IXP4XX_INDIRECT_PCI ARM: ebsa110: Properly override I/O accessors ARC: Remove redundant PCI_IOBASE declaration 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 ...
Showing
- Documentation/memory-barriers.txt 9 additions, 4 deletionsDocumentation/memory-barriers.txt
- arch/arc/include/asm/io.h 0 additions, 2 deletionsarch/arc/include/asm/io.h
- arch/arm/include/asm/io.h 36 additions, 53 deletionsarch/arm/include/asm/io.h
- arch/arm/include/asm/memory.h 4 additions, 0 deletionsarch/arm/include/asm/memory.h
- arch/arm/mach-ebsa110/include/mach/io.h 18 additions, 7 deletionsarch/arm/mach-ebsa110/include/mach/io.h
- arch/arm/mach-ebsa110/io.c 7 additions, 7 deletionsarch/arm/mach-ebsa110/io.c
- arch/arm/mach-ixp4xx/common.c 1 addition, 1 deletionarch/arm/mach-ixp4xx/common.c
- arch/arm/mach-ixp4xx/include/mach/io.h 22 additions, 2 deletionsarch/arm/mach-ixp4xx/include/mach/io.h
- arch/arm/mach-sa1100/pci-nanoengine.c 4 additions, 4 deletionsarch/arm/mach-sa1100/pci-nanoengine.c
- arch/arm64/Kconfig 1 addition, 1 deletionarch/arm64/Kconfig
- arch/arm64/include/asm/io.h 25 additions, 97 deletionsarch/arm64/include/asm/io.h
- arch/arm64/include/asm/memory.h 2 additions, 0 deletionsarch/arm64/include/asm/memory.h
- arch/cris/include/asm/io.h 3 additions, 0 deletionsarch/cris/include/asm/io.h
- arch/frv/include/asm/io.h 3 additions, 0 deletionsarch/frv/include/asm/io.h
- arch/ia64/include/asm/io.h 4 additions, 0 deletionsarch/ia64/include/asm/io.h
- arch/ia64/include/asm/uaccess.h 8 additions, 8 deletionsarch/ia64/include/asm/uaccess.h
- arch/m32r/include/asm/io.h 3 additions, 0 deletionsarch/m32r/include/asm/io.h
- arch/m68k/include/asm/io.h 8 additions, 0 deletionsarch/m68k/include/asm/io.h
- arch/m68k/include/asm/io_no.h 0 additions, 4 deletionsarch/m68k/include/asm/io_no.h
- arch/microblaze/include/asm/io.h 0 additions, 8 deletionsarch/microblaze/include/asm/io.h
Please register or sign in to comment