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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m68knommu
/
io.h
diff --git
a/include/asm-m68knommu/io.h
b/include/asm-m68knommu/io.h
index
654bf15
..
8df4cee
100644
(file)
--- a/
include/asm-m68knommu/io.h
+++ b/
include/asm-m68knommu/io.h
@@
-3,7
+3,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
/*
* These are for ISA/PCI shared memory _only_ and should never be used
/*
* These are for ISA/PCI shared memory _only_ and should never be used
@@
-102,6
+101,8
@@
static inline void io_insl(unsigned int addr, void *buf, int len)
*bp++ = _swapl(*ap);
}
*bp++ = _swapl(*ap);
}
+#define mmiowb()
+
/*
* make the short names macros so specific devices
* can override them as required
/*
* make the short names macros so specific devices
* can override them as required
@@
-145,19
+146,19
@@
static inline void io_insl(unsigned int addr, void *buf, int len)
extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
extern void __iounmap(void *addr, unsigned long size);
extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
extern void __iounmap(void *addr, unsigned long size);
-
extern
inline void *ioremap(unsigned long physaddr, unsigned long size)
+
static
inline void *ioremap(unsigned long physaddr, unsigned long size)
{
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
}
{
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
}
-
extern
inline void *ioremap_nocache(unsigned long physaddr, unsigned long size)
+
static
inline void *ioremap_nocache(unsigned long physaddr, unsigned long size)
{
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
}
{
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
}
-
extern
inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size)
+
static
inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size)
{
return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
}
{
return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
}
-
extern
inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size)
+
static
inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size)
{
return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
}
{
return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
}
@@
-185,6
+186,17
@@
extern void iounmap(void *addr);
#define virt_to_bus virt_to_phys
#define bus_to_virt phys_to_virt
#define virt_to_bus virt_to_phys
#define bus_to_virt phys_to_virt
+/*
+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+ * access
+ */
+#define xlate_dev_mem_ptr(p) __va(p)
+
+/*
+ * Convert a virtual cached pointer to an uncached pointer
+ */
+#define xlate_dev_kmem_ptr(p) p
+
#endif /* __KERNEL__ */
#endif /* _M68KNOMMU_IO_H */
#endif /* __KERNEL__ */
#endif /* _M68KNOMMU_IO_H */