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

Next file: linux/include/asm-alpha/core_cia.h
Previous file: linux/fs/umsdos/rdir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/include/asm-alpha/core_apecs.h linux/include/asm-alpha/core_apecs.h
@@ -495,11 +495,18 @@
 	*(vulp)addr = b;
 }
 
-__EXTERN_INLINE unsigned long apecs_ioremap(unsigned long addr)
+__EXTERN_INLINE unsigned long apecs_ioremap(unsigned long addr,
+					    unsigned long size
+					    __attribute__((unused)))
 {
 	return addr + APECS_DENSE_MEM;
 }
 
+__EXTERN_INLINE void apecs_iounmap(unsigned addr)
+{
+	return;
+}
+
 __EXTERN_INLINE int apecs_is_ioaddr(unsigned long addr)
 {
 	return addr >= IDENT_ADDR + 0x180000000UL;
@@ -525,7 +532,8 @@
 #define __writew(x,a)		apecs_writew((x),(unsigned long)(a))
 #define __writel(x,a)		apecs_writel((x),(unsigned long)(a))
 #define __writeq(x,a)		apecs_writeq((x),(unsigned long)(a))
-#define __ioremap(a)		apecs_ioremap((unsigned long)(a))
+#define __ioremap(a,s)		apecs_ioremap((unsigned long)(a),(s))
+#define __iounmap(a)		apecs_iounmap((unsigned long)(a))
 #define __is_ioaddr(a)		apecs_is_ioaddr((unsigned long)(a))
 
 #define __raw_readl(a)		__readl(a)

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