diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-alpha/core_cia.h | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-alpha/core_cia.h')
| -rw-r--r-- | include/asm-alpha/core_cia.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-alpha/core_cia.h b/include/asm-alpha/core_cia.h index 32fd81f2e..3407d0159 100644 --- a/include/asm-alpha/core_cia.h +++ b/include/asm-alpha/core_cia.h @@ -326,9 +326,9 @@ __EXTERN_INLINE unsigned int cia_inb(unsigned long addr) __EXTERN_INLINE void cia_outb(unsigned char b, unsigned long addr) { - unsigned int w = __kernel_insbl(b, addr & 3); + unsigned long w = __kernel_insbl(b, addr & 3); *(vuip) ((addr << 5) + CIA_IO + 0x00) = w; - wmb(); + mb(); } __EXTERN_INLINE unsigned int cia_inw(unsigned long addr) @@ -340,9 +340,9 @@ __EXTERN_INLINE unsigned int cia_inw(unsigned long addr) __EXTERN_INLINE void cia_outw(unsigned short b, unsigned long addr) { - unsigned int w = __kernel_inswl(b, addr & 3); + unsigned long w = __kernel_inswl(b, addr & 3); *(vuip) ((addr << 5) + CIA_IO + 0x08) = w; - wmb(); + mb(); } __EXTERN_INLINE unsigned int cia_inl(unsigned long addr) @@ -353,7 +353,7 @@ __EXTERN_INLINE unsigned int cia_inl(unsigned long addr) __EXTERN_INLINE void cia_outl(unsigned int b, unsigned long addr) { *(vuip) ((addr << 5) + CIA_IO + 0x18) = b; - wmb(); + mb(); } |