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

• Lines: 59
• Date: Thu Sep 13 15:21:32 2001
• Orig file: v2.4.9/linux/include/asm-alpha/core_cia.h
• Orig date: Sun Mar 19 10:26:21 2000

diff -u --recursive --new-file v2.4.9/linux/include/asm-alpha/core_cia.h linux/include/asm-alpha/core_cia.h
@@ -470,11 +470,18 @@
 	*(vulp)addr = b;
 }
 
-__EXTERN_INLINE unsigned long cia_ioremap(unsigned long addr)
+__EXTERN_INLINE unsigned long cia_ioremap(unsigned long addr,
+					  unsigned long size
+					  __attribute__((unused)))
 {
 	return addr + CIA_DENSE_MEM;
 }
 
+__EXTERN_INLINE void cia_iounmap(unsigned long addr)
+{
+	return;
+}
+
 __EXTERN_INLINE unsigned long cia_bwx_readb(unsigned long addr)
 {
 	return __kernel_ldbu(*(vucp)addr);
@@ -515,11 +522,17 @@
 	*(vulp)addr = b;
 }
 
-__EXTERN_INLINE unsigned long cia_bwx_ioremap(unsigned long addr)
+__EXTERN_INLINE unsigned long cia_bwx_ioremap(unsigned long addr,
+					      unsigned long size)
 {
 	return addr + CIA_BW_MEM;
 }
 
+__EXTERN_INLINE void cia_bwx_iounmap(unsigned long addr)
+{
+	return;
+}
+
 __EXTERN_INLINE int cia_is_ioaddr(unsigned long addr)
 {
 	return addr >= IDENT_ADDR + 0x8000000000UL;
@@ -548,7 +561,8 @@
 # define __writew(x,a)		cia_bwx_writew((x),(unsigned long)(a))
 # define __writel(x,a)		cia_bwx_writel((x),(unsigned long)(a))
 # define __writeq(x,a)		cia_bwx_writeq((x),(unsigned long)(a))
-# define __ioremap(a)		cia_bwx_ioremap((unsigned long)(a))
+# define __ioremap(a,s)		cia_bwx_ioremap((unsigned long)(a),(s))
+# define __iounmap(a)           cia_bwx_iounmap((unsigned long)(a))
 # define inb(p)			__inb(p)
 # define inw(p)			__inw(p)
 # define inl(p)			__inl(p)
@@ -578,7 +592,8 @@
 # define __writew(x,a)		cia_writew((x),(unsigned long)(a))
 # define __writel(x,a)		cia_writel((x),(unsigned long)(a))
 # define __writeq(x,a)		cia_writeq((x),(unsigned long)(a))
-# define __ioremap(a)		cia_ioremap((unsigned long)(a))
+# define __ioremap(a,s)		cia_ioremap((unsigned long)(a),(s))
+# define __iounmap(a)           cia_iounmap((unsigned long)(a))
 # define __raw_readl(a)		__readl(a)
 # define __raw_readq(a)		__readq(a)
 # define __raw_writel(v,a)	__writel((v),(a))