vserver 1.9.5.x5

[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..a5d3abe 100644 (file)
--- a/include/asm-m32r/io.h
+++ b/include/asm-m32r/io.h
@@ -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 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))
@@ -159,10 +162,12 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define __raw_writew writew
 #define __raw_writel writel
 
+#define mmiowb()
+
 #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
@@ -174,14 +179,14 @@ static inline void _writel(unsigned long l, unsigned long addr)
  *     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
-printk("isa_check_signature\n");
+printk("check_signature\n");
         do {
-                if (isa_readb(io_addr) != *signature)
+                if (readb(io_addr) != *signature)
                         goto out;
                 io_addr++;
                 signature++;