---

yaml --- r: 95672 b: refs/heads/master c: ef3fb66 h: refs/heads/master v: v3
git-mirror · May 1, 2008 · bdfec10 · bdfec10
1 parent 7327524
commit bdfec10
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99da9047e675a4a8d671bbd67b34eb096c308b0d
+refs/heads/master: ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6
diff --git a/trunk/include/asm-ia64/dmi.h b/trunk/include/asm-ia64/dmi.h
@@ -3,4 +3,9 @@
 
 #include <asm/io.h>
 
+/* Use normal IO mappings for DMI */
+#define dmi_ioremap ioremap
+#define dmi_iounmap(x,l) iounmap(x)
+#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
+
 #endif
diff --git a/trunk/include/asm-ia64/io.h b/trunk/include/asm-ia64/io.h
@@ -423,11 +423,6 @@ extern void __iomem * ioremap(unsigned long offset, unsigned long size);
 extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
 extern void iounmap (volatile void __iomem *addr);
 
-/* Use normal IO mappings for DMI */
-#define dmi_ioremap ioremap
-#define dmi_iounmap(x,l) iounmap(x)
-#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
-
 /*
  * String version of IO memory access ops:
  */

diff --git a/trunk/include/asm-x86/dmi.h b/trunk/include/asm-x86/dmi.h
@@ -27,6 +27,7 @@ static inline void *dmi_alloc(unsigned len)
 
 #endif
 
+/* Use early IO mappings for DMI because it's initialized early */
 #define dmi_ioremap early_ioremap
 #define dmi_iounmap early_iounmap
 

diff --git a/trunk/include/asm-x86/io_32.h b/trunk/include/asm-x86/io_32.h
@@ -133,11 +133,6 @@ extern void *early_ioremap(unsigned long offset, unsigned long size);
 extern void early_iounmap(void *addr, unsigned long size);
 extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
 
-/* Use early IO mappings for DMI because it's initialized early */
-#define dmi_ioremap early_ioremap
-#define dmi_iounmap early_iounmap
-#define dmi_alloc alloc_bootmem
-
 /*
  * ISA I/O bus memory addresses are 1:1 with the physical address.
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ static inline void *dmi_alloc(unsigned len) @@
     #endif
+    /* Use early IO mappings for DMI because it's initialized early */
     #define dmi_ioremap early_ioremap
     #define dmi_iounmap early_iounmap
@@ Expand Down @@