From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Feb 2006 17:58:27 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.16-rc3~57
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f564c5fe29d3fa9adc6d839714521b0554c62598;hp=-c;p=linux-2.6

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
---

f564c5fe29d3fa9adc6d839714521b0554c62598
diff --combined include/asm-mips/io.h
index 6c0aae5151,05de7c174e..5a4c8a54b8
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@@ -56,38 -56,38 +56,38 @@@
   * variations of functions: non-prefixed ones that preserve the value
   * and prefixed ones that preserve byte addresses.  The latters are
   * typically used for moving raw data between a peripheral and memory (cf.
 - * string I/O functions), hence the "mem_" prefix.
 + * string I/O functions), hence the "__mem_" prefix.
   */
  #if defined(CONFIG_SWAP_IO_SPACE)
  
  # define ioswabb(x)		(x)
 -# define mem_ioswabb(x)		(x)
 +# define __mem_ioswabb(x)	(x)
  # ifdef CONFIG_SGI_IP22
  /*
   * IP22 seems braindead enough to swap 16bits values in hardware, but
   * not 32bits.  Go figure... Can't tell without documentation.
   */
  #  define ioswabw(x)		(x)
 -#  define mem_ioswabw(x)	le16_to_cpu(x)
 +#  define __mem_ioswabw(x)	le16_to_cpu(x)
  # else
  #  define ioswabw(x)		le16_to_cpu(x)
 -#  define mem_ioswabw(x)	(x)
 +#  define __mem_ioswabw(x)	(x)
  # endif
  # define ioswabl(x)		le32_to_cpu(x)
 -# define mem_ioswabl(x)		(x)
 +# define __mem_ioswabl(x)	(x)
  # define ioswabq(x)		le64_to_cpu(x)
 -# define mem_ioswabq(x)		(x)
 +# define __mem_ioswabq(x)	(x)
  
  #else
  
  # define ioswabb(x)		(x)
 -# define mem_ioswabb(x)		(x)
 +# define __mem_ioswabb(x)	(x)
  # define ioswabw(x)		(x)
 -# define mem_ioswabw(x)		cpu_to_le16(x)
 +# define __mem_ioswabw(x)	cpu_to_le16(x)
  # define ioswabl(x)		(x)
 -# define mem_ioswabl(x)		cpu_to_le32(x)
 +# define __mem_ioswabl(x)	cpu_to_le32(x)
  # define ioswabq(x)		(x)
 -# define mem_ioswabq(x)		cpu_to_le32(x)
 +# define __mem_ioswabq(x)	cpu_to_le32(x)
  
  #endif
  
@@@ -342,7 -342,7 +342,7 @@@ static inline void pfx##write##bwlq(typ
  		BUG();							\
  }									\
  									\
- static inline type pfx##read##bwlq(volatile void __iomem *mem)		\
+ static inline type pfx##read##bwlq(const volatile void __iomem *mem)	\
  {									\
  	volatile type *__mem;						\
  	type __val;							\
@@@ -417,7 -417,7 +417,7 @@@ __BUILD_MEMORY_SINGLE(bus, bwlq, type, 
  									\
  __BUILD_MEMORY_PFX(__raw_, bwlq, type)					\
  __BUILD_MEMORY_PFX(, bwlq, type)					\
 -__BUILD_MEMORY_PFX(mem_, bwlq, type)					\
 +__BUILD_MEMORY_PFX(__mem_, bwlq, type)					\
  
  BUILDIO_MEM(b, u8)
  BUILDIO_MEM(w, u16)
@@@ -430,7 -430,7 +430,7 @@@ BUILDIO_MEM(q, u64
  
  #define BUILDIO_IOPORT(bwlq, type)					\
  	__BUILD_IOPORT_PFX(, bwlq, type)				\
 -	__BUILD_IOPORT_PFX(mem_, bwlq, type)
 +	__BUILD_IOPORT_PFX(__mem_, bwlq, type)
  
  BUILDIO_IOPORT(b, u8)
  BUILDIO_IOPORT(w, u16)
@@@ -464,7 -464,7 +464,7 @@@ static inline void writes##bwlq(volatil
  	const volatile type *__addr = addr;				\
  									\
  	while (count--) {						\
 -		mem_write##bwlq(*__addr, mem);				\
 +		__mem_write##bwlq(*__addr, mem);			\
  		__addr++;						\
  	}								\
  }									\
@@@ -475,7 -475,7 +475,7 @@@ static inline void reads##bwlq(volatil
  	volatile type *__addr = addr;					\
  									\
  	while (count--) {						\
 -		*__addr = mem_read##bwlq(mem);				\
 +		*__addr = __mem_read##bwlq(mem);			\
  		__addr++;						\
  	}								\
  }
@@@ -488,7 -488,7 +488,7 @@@ static inline void outs##bwlq(unsigned 
  	const volatile type *__addr = addr;				\
  									\
  	while (count--) {						\
 -		mem_out##bwlq(*__addr, port);				\
 +		__mem_out##bwlq(*__addr, port);				\
  		__addr++;						\
  	}								\
  }									\
@@@ -499,7 -499,7 +499,7 @@@ static inline void ins##bwlq(unsigned l
  	volatile type *__addr = addr;					\
  									\
  	while (count--) {						\
 -		*__addr = mem_in##bwlq(port);				\
 +		*__addr = __mem_in##bwlq(port);				\
  		__addr++;						\
  	}								\
  }