patch-2.4.10 linux/include/asm-alpha/core_tsunami.h

Next file: linux/include/asm-alpha/core_wildfire.h
Previous file: linux/include/asm-alpha/core_titan.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/include/asm-alpha/core_tsunami.h linux/include/asm-alpha/core_tsunami.h
@@ -352,11 +352,18 @@
  * Memory functions.  all accesses are done through linear space.
  */
 
-__EXTERN_INLINE unsigned long tsunami_ioremap(unsigned long addr)
+__EXTERN_INLINE unsigned long tsunami_ioremap(unsigned long addr, 
+					      unsigned long size
+					      __attribute__((unused)))
 {
 	return addr + TSUNAMI_MEM_BIAS;
 }
 
+__EXTERN_INLINE void tsunami_iounmap(unsigned long addr)
+{
+	return;
+}
+
 __EXTERN_INLINE int tsunami_is_ioaddr(unsigned long addr)
 {
 	return addr >= TSUNAMI_BASE;
@@ -423,7 +430,8 @@
 #define __writew(x,a)		tsunami_writew((x),(unsigned long)(a))
 #define __writel(x,a)		tsunami_writel((x),(unsigned long)(a))
 #define __writeq(x,a)		tsunami_writeq((x),(unsigned long)(a))
-#define __ioremap(a)		tsunami_ioremap((unsigned long)(a))
+#define __ioremap(a,s)		tsunami_ioremap((unsigned long)(a),(s))
+#define __iounmap(a)		tsunami_iounmap((unsigned long)(a))
 #define __is_ioaddr(a)		tsunami_is_ioaddr((unsigned long)(a))
 
 #define inb(p)			__inb(p)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)