diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 08:24:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 08:24:47 -0800 |
commit | 6895210e89df20520916c94a4dc148a43229053e (patch) | |
tree | 60b137cccd4a57bb98bbfed55a42859e4b60c8db /arch/sparc/include/asm/io_32.h | |
parent | 4c10c937cc2eb197db565392db91d429eec71176 (diff) | |
parent | 8a4fd1e4922413cfdfa6c51a59efb720d904a5eb (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Make prom entry spinlock NMI safe.
sparc64: Kill off old sys_perfctr system call and state.
sparc: Update defconfigs.
sparc: Provide io{read,write}{16,32}be().
Diffstat (limited to 'arch/sparc/include/asm/io_32.h')
-rw-r--r-- | arch/sparc/include/asm/io_32.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h index 679c7504625..2889574608d 100644 --- a/arch/sparc/include/asm/io_32.h +++ b/arch/sparc/include/asm/io_32.h @@ -249,10 +249,14 @@ extern void iounmap(volatile void __iomem *addr); #define ioread8(X) readb(X) #define ioread16(X) readw(X) +#define ioread16be(X) __raw_readw(X) #define ioread32(X) readl(X) +#define ioread32be(X) __raw_readl(X) #define iowrite8(val,X) writeb(val,X) #define iowrite16(val,X) writew(val,X) +#define iowrite16be(val,X) __raw_writew(val,X) #define iowrite32(val,X) writel(val,X) +#define iowrite32be(val,X) __raw_writel(val,X) static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count) { |