diff options
| author | Linus Torvalds <[email protected]> | 2022-10-06 19:10:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-10-06 19:10:37 +0000 |
| commit | 93ed07a23fd08b8613f64cf0a15d7fbdaca010fd (patch) | |
| tree | ef8da727c220b76b44fc33a12d8247ba5a2f300f /arch/sparc/include/asm/io.h | |
| parent | Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | alpha: add full ioread64/iowrite64 implementation (diff) | |
| download | kernel-93ed07a23fd08b8613f64cf0a15d7fbdaca010fd.tar.gz kernel-93ed07a23fd08b8613f64cf0a15d7fbdaca010fd.zip | |
Merge tag 'asm-generic-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"This contains a series from Linus Walleij to unify the linux/io.h
interface by making the ia64, alpha, parisc and sparc include
asm-generic/io.h.
All functions provided by the generic header are now available to all
drivers, but the architectures can still override this.
For the moment, mips and sh still don't include asm-generic/io.h but
provide a full set of functions themselves.
There are also a few minor cleanups unrelated to this"
* tag 'asm-generic-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
alpha: add full ioread64/iowrite64 implementation
parisc: Drop homebrewn io[read|write]64_[lo_hi|hi_lo]
parisc: hide ioread64 declaration on 32-bit
ia64: export memory_add_physaddr_to_nid to fix cxl build error
asm-generic: Remove empty #ifdef SA_RESTORER
parisc: Use the generic IO helpers
parisc: Remove 64bit access on 32bit machines
sparc: Fix the generic IO helpers
alpha: Use generic <asm-generic/io.h>
Diffstat (limited to 'arch/sparc/include/asm/io.h')
| -rw-r--r-- | arch/sparc/include/asm/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h index 2eefa526b38f..2dad9be9ec75 100644 --- a/arch/sparc/include/asm/io.h +++ b/arch/sparc/include/asm/io.h @@ -19,4 +19,6 @@ #define writel_be(__w, __addr) __raw_writel(__w, __addr) #define writew_be(__l, __addr) __raw_writew(__l, __addr) +#include <asm-generic/io.h> + #endif |