patch-2.1.31 linux/include/asm-i386/io.h

• Lines: 34
• Date: Wed Apr 2 17:51:57 1997
• Orig file: v2.1.30/linux/include/asm-i386/io.h
• Orig date: Mon Oct 14 23:31:45 1996

diff -u --recursive --new-file v2.1.30/linux/include/asm-i386/io.h linux/include/asm-i386/io.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
+#include <linux/vmalloc.h>
+
 /*
  * This file contains the definitions for the x86 IO instructions
  * inb/inw/inl/outb/outw/outl and the "string versions" of the same
@@ -184,7 +186,23 @@
 	return __io_virt(address);
 }
 
-extern void * ioremap(unsigned long offset, unsigned long size);
+extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
+
+extern inline void * ioremap (unsigned long offset, unsigned long size)
+{
+	return __ioremap(offset, size, 0);
+}
+
+/*
+ * This one maps high address device memory and turns off caching for that area.
+ * it's useful if some control registers are in such an area and write combining
+ * or read caching is not desirable:
+ */
+extern inline void * ioremap_nocache (unsigned long offset, unsigned long size)
+{
+        return __ioremap(offset, size, _PAGE_PCD);
+}
+
 extern void iounmap(void *addr);
 
 /*