===== arch/ia64/sn/kernel/sn2/io.c 1.5 vs edited =====
--- 1.5/arch/ia64/sn/kernel/sn2/io.c	2004-02-03 21:31:10 -08:00
+++ edited/arch/ia64/sn/kernel/sn2/io.c	2004-10-11 19:27:59 -07:00
@@ -65,49 +65,49 @@
 }
 
 unsigned char
-__sn_readb (void *addr)
+__sn_readb (const volatile void __iomem *addr)
 {
 	return ___sn_readb (addr);
 }
 
 unsigned short
-__sn_readw (void *addr)
+__sn_readw (const volatile void __iomem *addr)
 {
 	return ___sn_readw (addr);
 }
 
 unsigned int
-__sn_readl (void *addr)
+__sn_readl (const volatile void __iomem *addr)
 {
 	return ___sn_readl (addr);
 }
 
 unsigned long
-__sn_readq (void *addr)
+__sn_readq (const volatile void __iomem *addr)
 {
 	return ___sn_readq (addr);
 }
 
 unsigned char
-__sn_readb_relaxed (void *addr)
+__sn_readb_relaxed (const volatile void __iomem *addr)
 {
 	return ___sn_readb_relaxed (addr);
 }
 
 unsigned short
-__sn_readw_relaxed (void *addr)
+__sn_readw_relaxed (const volatile void __iomem *addr)
 {
 	return ___sn_readw_relaxed (addr);
 }
 
 unsigned int
-__sn_readl_relaxed (void *addr)
+__sn_readl_relaxed (const volatile void __iomem *addr)
 {
 	return ___sn_readl_relaxed (addr);
 }
 
 unsigned long
-__sn_readq_relaxed (void *addr)
+__sn_readq_relaxed (const volatile void __iomem *addr)
 {
 	return ___sn_readq_relaxed (addr);
 }
===== include/asm-ia64/sn/sn2/io.h 1.6 vs edited =====
--- 1.6/include/asm-ia64/sn/sn2/io.h	2004-07-22 17:00:00 -07:00
+++ edited/include/asm-ia64/sn/sn2/io.h	2004-10-11 19:28:51 -07:00
@@ -127,7 +127,7 @@
  */
 
 static inline unsigned char
-___sn_readb (void *addr)
+___sn_readb (const volatile void __iomem *addr)
 {
 	unsigned char val;
 
@@ -138,7 +138,7 @@
 }
 
 static inline unsigned short
-___sn_readw (void *addr)
+___sn_readw (const volatile void __iomem *addr)
 {
 	unsigned short val;
 
@@ -149,7 +149,7 @@
 }
 
 static inline unsigned int
-___sn_readl (void *addr)
+___sn_readl (const volatile void __iomem *addr)
 {
 	unsigned int val;
 
@@ -160,7 +160,7 @@
 }
 
 static inline unsigned long
-___sn_readq (void *addr)
+___sn_readq (const volatile void __iomem *addr)
 {
 	unsigned long val;
 
@@ -213,25 +213,25 @@
 }
 
 static inline unsigned char
-___sn_readb_relaxed (void *addr)
+___sn_readb_relaxed (const volatile void __iomem *addr)
 {
 	return *(volatile unsigned char *)addr;
 }
 
 static inline unsigned short
-___sn_readw_relaxed (void *addr)
+___sn_readw_relaxed (const volatile void __iomem *addr)
 {
 	return *(volatile unsigned short *)addr;
 }
 
 static inline unsigned int
-___sn_readl_relaxed (void *addr)
+___sn_readl_relaxed (const volatile void __iomem *addr)
 {
 	return *(volatile unsigned int *) addr;
 }
 
 static inline unsigned long
-___sn_readq_relaxed (void *addr)
+___sn_readq_relaxed (const volatile void __iomem *addr)
 {
 	return *(volatile unsigned long *) addr;
 }