patch-2.4.21 linux-2.4.21/include/asm-cris/io.h

• Lines: 39
• Date: 2003-06-13 07:51:38.000000000 -0700
• Orig file: linux-2.4.20/include/asm-cris/io.h
• Orig date: 2001-10-08 11:43:54.000000000 -0700

diff -urN linux-2.4.20/include/asm-cris/io.h linux-2.4.21/include/asm-cris/io.h
@@ -3,6 +3,8 @@
 
 #include <asm/page.h>   /* for __va, __pa */
 #include <asm/svinto.h>
+#include <linux/sched.h>
+#include <asm/pgtable.h>
 #include <linux/config.h>
 
 /* Console I/O for simulated etrax100.  Use #ifdef so erroneous
@@ -199,16 +201,18 @@
  * Change virtual addresses to physical addresses and vv.
  */
 
-static inline unsigned long virt_to_phys(volatile void * address)
+extern inline unsigned long virt_to_phys(volatile void * address)
 {
 	return __pa(address);
 }
 
-static inline void * phys_to_virt(unsigned long address)
+extern inline void * phys_to_virt(unsigned long address)
 {
 	return __va(address);
 }
 
+#define page_to_phys(page)	__pa(__page_address(page))
+
 extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
 
 extern inline void * ioremap (unsigned long offset, unsigned long size)
@@ -216,6 +220,8 @@
 	return __ioremap(offset, size, 0);
 }
 
+extern void iounmap(void *addr);
+
 /*
  * IO bus memory addresses are also 1:1 with the physical address
  */