[Linux-mips-commits]CVS: linux/include/asm-mips64 io.h,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv13786

Modified Files:
	io.h 
Log Message:
Synced up.

Index: io.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/io.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** io.h	2001/07/24 16:56:41	1.3
--- io.h	2001/09/04 16:15:50	1.4
***************
*** 37,41 ****
   * the drivers to handle caching properly.
   */
! extern inline void *
  ioremap(unsigned long offset, unsigned long size)
  {
--- 37,41 ----
   * the drivers to handle caching properly.
   */
! static inline void *
  ioremap(unsigned long offset, unsigned long size)
  {
***************
*** 47,51 ****
   * combining or read caching is not desirable.
   */
! extern inline void *
  ioremap_nocache (unsigned long offset, unsigned long size)
  {
--- 47,51 ----
   * combining or read caching is not desirable.
   */
! static inline void *
  ioremap_nocache (unsigned long offset, unsigned long size)
  {
***************
*** 53,57 ****
  }
  
! extern inline void iounmap(void *addr)
  {
  }
--- 53,57 ----
  }
  
! static inline void iounmap(void *addr)
  {
  }
***************
*** 103,112 ****
   * These are trivial on the 1:1 Linux/MIPS mapping
   */
! extern inline unsigned long virt_to_phys(volatile void * address)
  {
  	return (unsigned long)address - PAGE_OFFSET;
  }
  
! extern inline void * phys_to_virt(unsigned long address)
  {
  	return (void *)(address + PAGE_OFFSET);
--- 103,112 ----
   * These are trivial on the 1:1 Linux/MIPS mapping
   */
! static inline unsigned long virt_to_phys(volatile void * address)
  {
  	return (unsigned long)address - PAGE_OFFSET;
  }
  
! static inline void * phys_to_virt(unsigned long address)
  {
  	return (void *)(address + PAGE_OFFSET);
***************
*** 162,166 ****
  
  #define __IN1(t,s) \
! extern __inline__ t __in##s(unsigned long port) { t _v;
  
  /*
--- 162,166 ----
  
  #define __IN1(t,s) \
! extern inline t __in##s(unsigned long port) { t _v;
  
  /*
***************
*** 361,373 ****
  
  /* This is for example for IP27.  */
! extern inline void dma_cache_wback_inv(unsigned long start, unsigned long size)
  {
  }
  
! extern inline void dma_cache_wback(unsigned long start, unsigned long size)
  {
  }
  
! extern inline void dma_cache_inv(unsigned long start, unsigned long size)
  {
  }
--- 361,373 ----
  
  /* This is for example for IP27.  */
! static inline void dma_cache_wback_inv(unsigned long start, unsigned long size)
  {
  }
  
! static inline void dma_cache_wback(unsigned long start, unsigned long size)
  {
  }
  
! static inline void dma_cache_inv(unsigned long start, unsigned long size)
  {
  }