[Linux-mips-commits]CVS: linux/include/asm-mips io.h,1.20,1.21

[Paul M. <le...@us...>]

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

Modified Files:
	io.h 
Log Message:
More syncing..



Index: io.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/io.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- io.h	24 Mar 2002 00:01:51 -0000	1.20
+++ io.h	21 Apr 2002 20:19:17 -0000	1.21
@@ -15,6 +15,7 @@
 #include <linux/pagemap.h>
 #include <linux/types.h>
 #include <asm/addrspace.h>
+#include <asm/pgtable-bits.h>
 #include <asm/byteorder.h>
 
 /*
@@ -134,25 +135,14 @@
 
 extern void * __ioremap(phys_t offset, phys_t size, unsigned long flags);
 
-static inline void *ioremap(phys_t offset, unsigned long size)
-{
-	return __ioremap(offset, size, _CACHE_UNCACHED);
-}
-
-static inline void *ioremap_nocache(phys_t offset, unsigned long size)
-{
-	return __ioremap(offset, size, _CACHE_UNCACHED);
-}
-
-static inline void *ioremap_cacheable_cow(phys_t offset, unsigned long size)
-{
-	return __ioremap(offset, size, _CACHE_CACHABLE_COW);
-}
-
-static inline void *ioremap_uncached_accelerated(phys_t offset, unsigned long size)
-{
-        return __ioremap(offset, size, _CACHE_UNCACHED_ACCELERATED);
-}
+#define ioremap(offset, size)						\
+	__ioremap((offset), (size), _CACHE_UNCACHED)
+#define ioremap_nocache(offset, size)					\
+	__ioremap((offset), (size), _CACHE_UNCACHED)
+#define ioremap_cacheable_cow(offset, size)				\
+	__ioremap((offset), (size), _CACHE_CACHABLE_COW)
+#define ioremap_uncached_accelerated(offset, size)			\
+	__ioremap((offset), (size), _CACHE_UNCACHED_ACCELERATED)
 
 extern void iounmap(void *addr);