CVS Update@linux-mips.org: linux

[macro@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     macro@ftp.linux-mips.org        05/01/19 05:09:47

Modified files:
        include/asm-mips: io.h 

Log message:
        Add "volatile" and "__iomem" qualifiers.

diff -urN linux/include/asm-mips/io.h linux/include/asm-mips/io.h
--- linux/include/asm-mips/io.h 2005/01/11 16:39:47     1.79
+++ linux/include/asm-mips/io.h 2005/01/19 05:09:47     1.80
@@ -6,7 +6,7 @@
  * Copyright (C) 1994, 1995 Waldorf GmbH
  * Copyright (C) 1994 - 2000 Ralf Baechle
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
- * Copyright (C) 2004  MIPS Technologies, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005  MIPS Technologies, Inc.  All rights reserved.
  *     Author: Maciej W. Rozycki <macro@mips.com>
  */
 #ifndef _ASM_IO_H
@@ -271,7 +271,8 @@
 
 #define __BUILD_MEMORY_SINGLE(pfx, bwlq, type, irq)                    \
                                                                        \
-static inline void pfx##write##bwlq(type val, void *mem)               \
+static inline void pfx##write##bwlq(type val,                          \
+                                   volatile void __iomem *mem)         \
 {                                                                      \
        volatile type *__mem;                                           \
        type __val;                                                     \
@@ -304,7 +305,7 @@
                BUG();                                                  \
 }                                                                      \
                                                                        \
-static inline type pfx##read##bwlq(void *mem)                          \
+static inline type pfx##read##bwlq(volatile void __iomem *mem)         \
 {                                                                      \
        volatile type *__mem;                                           \
        type __val;                                                     \
@@ -413,7 +414,7 @@
 
 #define __BUILD_MEMORY_STRING(bwlq, type)                              \
                                                                        \
-static inline void writes##bwlq(void *mem, void *addr,                 \
+static inline void writes##bwlq(volatile void __iomem *mem, void *addr,        
\
                                unsigned int count)                     \
 {                                                                      \
        volatile type *__addr = addr;                                   \
@@ -424,7 +425,7 @@
        }                                                               \
 }                                                                      \
                                                                        \
-static inline void reads##bwlq(void *mem, void *addr,                  \
+static inline void reads##bwlq(volatile void __iomem *mem, void *addr, \
                               unsigned int count)                      \
 {                                                                      \
        volatile type *__addr = addr;                                   \