From bdfec107618722dd4a1ca6f69a07d31911c4cc96 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 1 May 2008 04:35:01 -0700
Subject: [PATCH] --- yaml --- r: 95672 b: refs/heads/master c:
 ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/asm-ia64/dmi.h  | 5 +++++
 trunk/include/asm-ia64/io.h   | 5 -----
 trunk/include/asm-x86/dmi.h   | 1 +
 trunk/include/asm-x86/io_32.h | 5 -----
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index b9082565034b..60230ed81641 100644
--- 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
index f3efaa229525..00eb1b130b63 100644
--- 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
index 4ebed77aa472..260a85ac9d6a 100644
--- 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
index 1241e6ad1935..4edf7514a750 100644
--- 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
index 6e73467a4fb1..049e81e797a0 100644
--- 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.
  */