From 6c195427042b3bf4752f682a8e0d1a4dba96302a Mon Sep 17 00:00:00 2001 From: Cedric Le Goater Date: Mon, 19 Jun 2006 21:10:44 -0700 Subject: [PATCH] --- yaml --- r: 28119 b: refs/heads/master c: 2eec0e0842ef747027eb9181d5f50d7157184d57 h: refs/heads/master i: 28117: ff4634ded38ca6b71775c5f0e10e658e9ec684c8 28115: d62a5d165d8f84ec2accf8efc972c000bb53dae6 28111: ea1580e53a15d98c2908efec9233351952f7862f v: v3 --- [refs] | 2 +- trunk/include/asm-s390/io.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0054d6a533dc..670f3fc2a236 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b41fd1785f4effe2f3bd40da864415812f5b8c9 +refs/heads/master: 2eec0e0842ef747027eb9181d5f50d7157184d57 diff --git a/trunk/include/asm-s390/io.h b/trunk/include/asm-s390/io.h index b05825dd16d7..d4614b35f423 100644 --- a/trunk/include/asm-s390/io.h +++ b/trunk/include/asm-s390/io.h @@ -86,20 +86,25 @@ extern void iounmap(void *addr); #define readb(addr) (*(volatile unsigned char *) __io_virt(addr)) #define readw(addr) (*(volatile unsigned short *) __io_virt(addr)) #define readl(addr) (*(volatile unsigned int *) __io_virt(addr)) +#define readq(addr) (*(volatile unsigned long long *) __io_virt(addr)) #define readb_relaxed(addr) readb(addr) #define readw_relaxed(addr) readw(addr) #define readl_relaxed(addr) readl(addr) +#define readq_relaxed(addr) readq(addr) #define __raw_readb readb #define __raw_readw readw #define __raw_readl readl +#define __raw_readq readq #define writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b)) #define writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b)) #define writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b)) +#define writeq(b,addr) (*(volatile unsigned long long *) __io_virt(addr) = (b)) #define __raw_writeb writeb #define __raw_writew writew #define __raw_writel writel +#define __raw_writeq writeq #define memset_io(a,b,c) memset(__io_virt(a),(b),(c)) #define memcpy_fromio(a,b,c) memcpy((a),__io_virt(b),(c))