diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-20 17:13:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-20 17:13:10 -0700 |
| commit | befb173bdb23432483d90e58cc93ab77ab9e2b1d (patch) | |
| tree | 98523b3bac0a4c7e9ddb5b72da5e69585f344291 | |
| parent | 5afe9abc48d6c7381f9988499de745c463ed71be (diff) | |
| parent | b3047281c042bdbff515533fb3d540a7834620f2 (diff) | |
Merge bk://drm.bkbits.net/drm-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | include/asm-ppc64/io.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h index 1e9cd557352e..46d47573d1a4 100644 --- a/include/asm-ppc64/io.h +++ b/include/asm-ppc64/io.h @@ -71,35 +71,35 @@ extern unsigned long pci_io_base; static inline unsigned char __raw_readb(const volatile void __iomem *addr) { - return *(unsigned char __force *)addr; + return *(volatile unsigned char __force *)addr; } static inline unsigned short __raw_readw(const volatile void __iomem *addr) { - return *(unsigned short __force *)addr; + return *(volatile unsigned short __force *)addr; } static inline unsigned int __raw_readl(const volatile void __iomem *addr) { - return *(unsigned int __force *)addr; + return *(volatile unsigned int __force *)addr; } static inline unsigned long __raw_readq(const volatile void __iomem *addr) { - return *(unsigned long __force *)addr; + return *(volatile unsigned long __force *)addr; } static inline void __raw_writeb(unsigned char v, volatile void __iomem *addr) { - *(unsigned char __force *)addr = v; + *(volatile unsigned char __force *)addr = v; } static inline void __raw_writew(unsigned short v, volatile void __iomem *addr) { - *(unsigned short __force *)addr = v; + *(volatile unsigned short __force *)addr = v; } static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) { - *(unsigned int __force *)addr = v; + *(volatile unsigned int __force *)addr = v; } static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) { - *(unsigned long __force *)addr = v; + *(volatile unsigned long __force *)addr = v; } #define readb(addr) eeh_readb(addr) #define readw(addr) eeh_readw(addr) |