git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ia64
/
lib
/
io.c
diff --git
a/arch/ia64/lib/io.c
b/arch/ia64/lib/io.c
index
90f0f30
..
8949e44
100644
(file)
--- a/
arch/ia64/lib/io.c
+++ b/
arch/ia64/lib/io.c
@@
-8,8
+8,7
@@
* Copy data from IO memory space to "real" memory space.
* This needs to be optimized.
*/
* Copy data from IO memory space to "real" memory space.
* This needs to be optimized.
*/
-void
-__ia64_memcpy_fromio (void *to, unsigned long from, long count)
+void memcpy_fromio(void *to, const volatile void __iomem *from, long count)
{
char *dst = to;
{
char *dst = to;
@@
-18,30
+17,28
@@
__ia64_memcpy_fromio (void *to, unsigned long from, long count)
*dst++ = readb(from++);
}
}
*dst++ = readb(from++);
}
}
-EXPORT_SYMBOL(
__ia64_
memcpy_fromio);
+EXPORT_SYMBOL(memcpy_fromio);
/*
* Copy data from "real" memory space to IO memory space.
* This needs to be optimized.
*/
/*
* Copy data from "real" memory space to IO memory space.
* This needs to be optimized.
*/
-void
-__ia64_memcpy_toio (unsigned long to, void *from, long count)
+void memcpy_toio(volatile void __iomem *to, const void *from, long count)
{
{
- char *src = from;
+ c
onst c
har *src = from;
while (count) {
count--;
writeb(*src++, to++);
}
}
while (count) {
count--;
writeb(*src++, to++);
}
}
-EXPORT_SYMBOL(
__ia64_
memcpy_toio);
+EXPORT_SYMBOL(memcpy_toio);
/*
* "memset" on IO memory space.
* This needs to be optimized.
*/
/*
* "memset" on IO memory space.
* This needs to be optimized.
*/
-void
-__ia64_memset_c_io (unsigned long dst, unsigned long c, long count)
+void memset_io(volatile void __iomem *dst, int c, long count)
{
unsigned char ch = (char)(c & 0xff);
{
unsigned char ch = (char)(c & 0xff);
@@
-51,7
+48,7
@@
__ia64_memset_c_io (unsigned long dst, unsigned long c, long count)
dst++;
}
}
dst++;
}
}
-EXPORT_SYMBOL(
__ia64_memset_c
_io);
+EXPORT_SYMBOL(
memset
_io);
#ifdef CONFIG_IA64_GENERIC
#ifdef CONFIG_IA64_GENERIC
@@
-73,6
+70,7
@@
EXPORT_SYMBOL(__ia64_memset_c_io);
#undef __ia64_writew
#undef __ia64_writel
#undef __ia64_writeq
#undef __ia64_writew
#undef __ia64_writel
#undef __ia64_writeq
+#undef __ia64_mmiowb
unsigned int
__ia64_inb (unsigned long port)
unsigned int
__ia64_inb (unsigned long port)
@@
-111,51
+109,57
@@
__ia64_outl (unsigned int val, unsigned long port)
}
unsigned char
}
unsigned char
-__ia64_readb (void *addr)
+__ia64_readb (void
__iomem
*addr)
{
return ___ia64_readb (addr);
}
unsigned short
{
return ___ia64_readb (addr);
}
unsigned short
-__ia64_readw (void *addr)
+__ia64_readw (void
__iomem
*addr)
{
return ___ia64_readw (addr);
}
unsigned int
{
return ___ia64_readw (addr);
}
unsigned int
-__ia64_readl (void *addr)
+__ia64_readl (void
__iomem
*addr)
{
return ___ia64_readl (addr);
}
unsigned long
{
return ___ia64_readl (addr);
}
unsigned long
-__ia64_readq (void *addr)
+__ia64_readq (void
__iomem
*addr)
{
return ___ia64_readq (addr);
}
unsigned char
{
return ___ia64_readq (addr);
}
unsigned char
-__ia64_readb_relaxed (void *addr)
+__ia64_readb_relaxed (void
__iomem
*addr)
{
return ___ia64_readb (addr);
}
unsigned short
{
return ___ia64_readb (addr);
}
unsigned short
-__ia64_readw_relaxed (void *addr)
+__ia64_readw_relaxed (void
__iomem
*addr)
{
return ___ia64_readw (addr);
}
unsigned int
{
return ___ia64_readw (addr);
}
unsigned int
-__ia64_readl_relaxed (void *addr)
+__ia64_readl_relaxed (void
__iomem
*addr)
{
return ___ia64_readl (addr);
}
unsigned long
{
return ___ia64_readl (addr);
}
unsigned long
-__ia64_readq_relaxed (void *addr)
+__ia64_readq_relaxed (void
__iomem
*addr)
{
return ___ia64_readq (addr);
}
{
return ___ia64_readq (addr);
}
+void
+__ia64_mmiowb(void)
+{
+ ___ia64_mmiowb();
+}
+
#endif /* CONFIG_IA64_GENERIC */
#endif /* CONFIG_IA64_GENERIC */