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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-m32r
/
io.h
diff --git
a/include/asm-m32r/io.h
b/include/asm-m32r/io.h
index
97a64d3
..
70ad1c9
100644
(file)
--- a/
include/asm-m32r/io.h
+++ b/
include/asm-m32r/io.h
@@
-60,7
+60,7
@@
__ioremap(unsigned long offset, unsigned long size, unsigned long flags);
* address.
*/
* address.
*/
-static inline void
*
ioremap(unsigned long offset, unsigned long size)
+static inline void
__iomem *
ioremap(unsigned long offset, unsigned long size)
{
return __ioremap(offset, size, 0);
}
{
return __ioremap(offset, size, 0);
}
@@
-151,6
+151,9
@@
static inline void _writel(unsigned long l, unsigned long addr)
#define __raw_readb readb
#define __raw_readw readw
#define __raw_readl readl
#define __raw_readb readb
#define __raw_readw readw
#define __raw_readl readl
+#define readb_relaxed readb
+#define readw_relaxed readw
+#define readl_relaxed readl
#define writeb(val, addr) _writeb((val), (unsigned long)(addr))
#define writew(val, addr) _writew((val), (unsigned long)(addr))
#define writeb(val, addr) _writeb((val), (unsigned long)(addr))
#define writew(val, addr) _writew((val), (unsigned long)(addr))
@@
-159,10
+162,12
@@
static inline void _writel(unsigned long l, unsigned long addr)
#define __raw_writew writew
#define __raw_writel writel
#define __raw_writew writew
#define __raw_writel writel
+#define mmiowb()
+
#define flush_write_buffers() do { } while (0) /* M32R_FIXME */
/**
#define flush_write_buffers() do { } while (0) /* M32R_FIXME */
/**
- *
isa_check_signature
- find BIOS signatures
+ *
check_signature
- find BIOS signatures
* @io_addr: mmio address to check
* @signature: signature block
* @length: length of signature
* @io_addr: mmio address to check
* @signature: signature block
* @length: length of signature
@@
-174,14
+179,14
@@
static inline void _writel(unsigned long l, unsigned long addr)
* check_signature.
*/
* check_signature.
*/
-static inline int
isa_check_signature(unsigned long
io_addr,
+static inline int
check_signature(void __iomem *
io_addr,
const unsigned char *signature, int length)
{
int retval = 0;
#if 0
const unsigned char *signature, int length)
{
int retval = 0;
#if 0
-printk("
isa_
check_signature\n");
+printk("check_signature\n");
do {
do {
- if (
isa_
readb(io_addr) != *signature)
+ if (readb(io_addr) != *signature)
goto out;
io_addr++;
signature++;
goto out;
io_addr++;
signature++;
@@
-211,6
+216,17
@@
memcpy_toio(volatile void __iomem *dst, const void *src, int count)
memcpy((void __force *) dst, src, count);
}
memcpy((void __force *) dst, src, count);
}
+/*
+ * 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 /* _ASM_M32R_IO_H */
#endif /* __KERNEL__ */
#endif /* _ASM_M32R_IO_H */